lp:~neon/ark/master
- Get this branch:
- bzr branch lp:~neon/ark/master
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/ark.
Last successful import was .
Recent revisions
- 3399. By Elvis Angelaccio <email address hidden>
-
Drop custom mimetypes
The 4 mimetypes defined in kerfuffle.xml are part of
shared-mime-info since version 1.7, and even Debian stable
ships the 1.8 release these days.This also means we don't need anymore the optional dependency on
shared-mime-info (see bc8a185d6c872868ecf1705164da90 8737505f56) . - 3398. By Elvis Angelaccio <email address hidden>
-
Enable targets generation in the bin subfolder of the build dir
This allows to use ark even without `make install` [1].
[1]: https:/
/community. kde.org/ Guidelines_ and_HOWTOs/ Making_ apps_run_ uninstalled - 3395. By Elvis Angelaccio <email address hidden>
-
Merge branch 'Applications/
17.12' * Applications/17.12:
Add expected failures for timestamp tests
Fix build with Qt 5.11 - 3394. By Elvis Angelaccio <email address hidden>
-
LoadJob: check result in onFinished()
It doesn't make sense to set these properties if loading the archive
failed. This also allows to fix the expected values of a testcase. - 3393. By Elvis Angelaccio <email address hidden>
-
Rework kill logic
The libzip plugin sometimes cannot react to `QThread:
:requestInterru ption() `
because there is a blocking `zip_close()` which writes to disk (e.g. with AddJobs).This means we have to manually abort the thread (by passing a timeout to
`QThread::wait()` in `Job::doKill()`. We cannot do this uconditionally
because we would end up with crashes in libarchive. Since the libarchive
plugin is not affected by this problem, we rework the logic in
`Job::doKill()` by assuming that the interface will tell us whether it
needs to be brutally killed. This way we can distinguish between the
libarchive and the libzip plugins (the ones that use a worker thread).The mutex in this patch is needed because in theory `m_operationMode` could be
read and written by different threads at the same time, even though that's unlikely.BUG: 389290
FIXED-IN: 18.03.80
Task: T7824 - 3392. By Elvis Angelaccio <email address hidden>
-
libzip: implement killing TestJob
Depends on fa3865693c, otherwise we would get two messageboxes after
stopping the TestJob from the Plasma systray.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)