pyrox.dev / nixpkgs
lol
fork atom

qfsm: fix build with gcc 6 (#29245)

authored by timor and committed by Aristid Breitkreuz 124b3c8e 334e23d2

+24 -1
unified split
+4 -1
pkgs/applications/science/electronics/qfsm/default.nix
··· 10 11 buildInputs = [ qt4 cmake graphviz pkgconfig ]; 12 13 - patches = [ ./drop-hardcoded-prefix.patch ]; 14 15 hardeningDisable = [ "format" ]; 16
··· 10 11 buildInputs = [ qt4 cmake graphviz pkgconfig ]; 12 13 + patches = [ 14 + ./drop-hardcoded-prefix.patch 15 + ./gcc6-fixes.patch 16 + ]; 17 18 hardeningDisable = [ "format" ]; 19
+20
pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch
···
··· 1 + --- qfsm-0.54.0-Source-orig/src/FileIO.cpp 2015-01-02 19:01:46.000000000 +0100 2 + +++ qfsm-0.54.0-Source/src/FileIO.cpp 2017-09-11 19:53:30.579488402 +0200 3 + @@ -1617,7 +1617,7 @@ 4 + QString ext; 5 + 6 + if (!imp) 7 + - return FALSE; 8 + + return NULL; 9 + 10 + Project* p=NULL; 11 + importdlg->setAcceptMode(QFileDialog::AcceptOpen); 12 + @@ -1641,7 +1641,7 @@ 13 + ifstream fin(act_importfile); 14 + 15 + if (!fin) 16 + - return FALSE; 17 + + return NULL; 18 + 19 + emit setWaitCursor(); 20 +