The (exception based) error handling is now pulled in by e.g. image.hpp,
so more files require enabled exception handling.
Depends on D17872
Details
Details
- Reviewers
ngraham cfeck asturmlechner - Group Reviewers
Gwenview - Commits
- R260:b81eed1dc4d8: Compile more files with enabled exceptions, required for exiv2 0.27
build
Diff Detail
Diff Detail
- Repository
- R260 Gwenview
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Comment Actions
I can't comment whether this is the desired way to do it, but it does fix the build with exiv2 0.27, on openSUSE at least. (with D17872 in)
Without it, the compilation fails due to errors:
error: exception handling disabled, use -fexceptions to enable
And it still builds fine with exiv2 0.26 as well.
So +1 from me.
Comment Actions
PS: as this just adds to the already existing list, it should be fine anyway IMHO.
(and discussing whether it is the best way to do it is rather out of the scope of this patch, I think... ;-) )
Comment Actions
arc does something very strange when I try to apply this patch:
~/kde/src/gwenview$ (master) arc patch D17873
INFO Base commit is not in local repository; trying to fetch.
Created and checked out branch arcpatch-D17873.
Created and checked out branch arcpatch-D17872.
Checking patch tests/auto/imagemetainfomodeltest.cpp...
Checking patch tests/auto/cmsprofiletest.cpp...
Checking patch lib/timeutils.cpp...
Checking patch lib/jpegcontent.cpp...
Checking patch lib/exiv2imageloader.h...
Checking patch lib/exiv2imageloader.cpp...
Checking patch lib/document/loadingdocumentimpl.cpp...
Checking patch lib/document/document_p.h...
Checking patch lib/document/document.h...
Checking patch lib/document/document.cpp...
Checking patch lib/document/abstractdocumentimpl.h...
Checking patch lib/document/abstractdocumentimpl.cpp...
Checking patch lib/cms/cmsprofile.h...
Checking patch lib/cms/cmsprofile.cpp...
Applied patch tests/auto/imagemetainfomodeltest.cpp cleanly.
Applied patch tests/auto/cmsprofiletest.cpp cleanly.
Applied patch lib/timeutils.cpp cleanly.
Applied patch lib/jpegcontent.cpp cleanly.
Applied patch lib/exiv2imageloader.h cleanly.
Applied patch lib/exiv2imageloader.cpp cleanly.
Applied patch lib/document/loadingdocumentimpl.cpp cleanly.
Applied patch lib/document/document_p.h cleanly.
Applied patch lib/document/document.h cleanly.
Applied patch lib/document/document.cpp cleanly.
Applied patch lib/document/abstractdocumentimpl.h cleanly.
Applied patch lib/document/abstractdocumentimpl.cpp cleanly.
Applied patch lib/cms/cmsprofile.h cleanly.
Applied patch lib/cms/cmsprofile.cpp cleanly.
Cherry Pick Failed!
Exception
Command failed with error #1!
COMMAND
git cherry-pick 'arcpatch-D17872'
STDOUT
On branch arcpatch-D17873
You are currently cherry-picking commit f7dcd9a4.
nothing to commit, working tree clean
STDERR
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git reset'
(Run with `--trace` for a full exception trace.)Does it need a rebase on master or something?
Comment Actions
No, arc just needs a hit with the cluebat.
D17872 has landed, but as arc is completely ignorant, it tries to reapply it (as tries to apply the whole stack). It should know better, as phabricator is aware it already has been commited.
Just use arc patch --skip-dependencies D17873.