diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-09-04 20:19:44 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-09-04 20:19:44 +0200 |
| commit | b4cc33304856c45c4965127ea2905c7f20cb4eaa (patch) | |
| tree | c654168463fae5e46c3f0e41c2bc735e27995858 /pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch | |
| parent | 0a1690dd6bf9ed7f3d6d0caeb8036274deafcdac (diff) | |
| parent | fcf38c9baca5f009ceb601353dcb1857c29d3e06 (diff) | |
| download | nixpkgs-b4cc33304856c45c4965127ea2905c7f20cb4eaa.tar nixpkgs-b4cc33304856c45c4965127ea2905c7f20cb4eaa.tar.gz nixpkgs-b4cc33304856c45c4965127ea2905c7f20cb4eaa.tar.bz2 nixpkgs-b4cc33304856c45c4965127ea2905c7f20cb4eaa.tar.lz nixpkgs-b4cc33304856c45c4965127ea2905c7f20cb4eaa.tar.xz nixpkgs-b4cc33304856c45c4965127ea2905c7f20cb4eaa.tar.zst nixpkgs-b4cc33304856c45c4965127ea2905c7f20cb4eaa.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch')
| -rw-r--r-- | pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch b/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch deleted file mode 100644 index 5cedc647639..00000000000 --- a/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- qfsm-0.54.0-Source-orig/src/FileIO.cpp 2015-01-02 19:01:46.000000000 +0100 -+++ qfsm-0.54.0-Source/src/FileIO.cpp 2017-09-11 19:53:30.579488402 +0200 -@@ -1617,7 +1617,7 @@ - QString ext; - - if (!imp) -- return FALSE; -+ return NULL; - - Project* p=NULL; - importdlg->setAcceptMode(QFileDialog::AcceptOpen); -@@ -1641,7 +1641,7 @@ - ifstream fin(act_importfile); - - if (!fin) -- return FALSE; -+ return NULL; - - emit setWaitCursor(); - |