qimgv: 0.8.9 -> 0.9

https://github.com/easymodo/qimgv/compare/v0.8.9...v0.9
This commit is contained in:
Cole Helbling 2020-04-30 17:54:40 -07:00 committed by Frederik Rietdijk
parent ea18da4bc4
commit a3f27a2720
2 changed files with 28 additions and 2 deletions

View file

@ -1,12 +1,14 @@
{ mkDerivation { mkDerivation
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, pkgconfig , pkgconfig
, exiv2 , exiv2
, mpv , mpv
, opencv4
, qtbase , qtbase
, qtimageformats , qtimageformats
, qtsvg , qtsvg
@ -14,15 +16,25 @@
mkDerivation rec { mkDerivation rec {
pname = "qimgv"; pname = "qimgv";
version = "0.8.9"; version = "0.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "easymodo"; owner = "easymodo";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0cmya06j466v0pirhxbzbj1vbz0346y7rbc1gbv4n9xcp6c6bln6"; sha256 = "1yynjk47gjf2kjfb0ak4blxpb5irgqc1k59z726lwjd6gvg689fl";
}; };
patches = [
# QtAtomicInt's `storeRelaxed` was introduced in Qt 5.14, while nixpkgs only
# has Qt 5.12. This appears to be the only instance of Qt 5.12
# incompatibility, and will be fixed in the next release.
(fetchpatch {
url = "https://github.com/easymodo/qimgv/commit/a39d6086ceb9445d2c16943e0719096a99920bf8.patch";
sha256 = "1z3ngv6i316hrdcdzig4jg6bcdbgfxjaxvm2jcfcw2dnfbfiq47s";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig pkgconfig
@ -31,6 +43,7 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
exiv2 exiv2
mpv mpv
opencv4
qtbase qtbase
qtimageformats qtimageformats
qtsvg qtsvg

View file

@ -0,0 +1,13 @@
diff --git a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp
index 96ec9d3..6d95d08 100644
--- a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp
+++ b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp
@@ -21,7 +21,7 @@ void LinuxWorker::setDescriptor(int desc) {
void LinuxWorker::run() {
emit started();
- isRunning.storeRelaxed(true);
+ isRunning.store(true);
if (fd == -1) {
qDebug() << TAG << "File descriptor isn't set! Stopping";