diff options
| author | Samuel Leathers <sam@appliedtrust.com> | 2017-08-30 14:54:10 -0400 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-08-30 21:27:36 +0200 |
| commit | d99d9026b3f65aaac568006454507cad449e25cf (patch) | |
| tree | 4eb033adf50228143669679fef1376ecc101212b /pkgs/applications/video/k9copy | |
| parent | 8211dfb200d5f413da692d463b7d52daf4478582 (diff) | |
| download | nixlib-d99d9026b3f65aaac568006454507cad449e25cf.tar nixlib-d99d9026b3f65aaac568006454507cad449e25cf.tar.gz nixlib-d99d9026b3f65aaac568006454507cad449e25cf.tar.bz2 nixlib-d99d9026b3f65aaac568006454507cad449e25cf.tar.lz nixlib-d99d9026b3f65aaac568006454507cad449e25cf.tar.xz nixlib-d99d9026b3f65aaac568006454507cad449e25cf.tar.zst nixlib-d99d9026b3f65aaac568006454507cad449e25cf.zip | |
k9copy: fix build with gcc6
Diffstat (limited to 'pkgs/applications/video/k9copy')
| -rw-r--r-- | pkgs/applications/video/k9copy/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/video/k9copy/gcc6.patch | 26 |
2 files changed, 30 insertions, 0 deletions
diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix index 7e87f03725f4..48c7624cfa6a 100644 --- a/pkgs/applications/video/k9copy/default.nix +++ b/pkgs/applications/video/k9copy/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { sha256 = "0dp06rwihks50c57bbv04d6bj2qc88isl91971r4lii2xp0qn7sg"; }; + patches = [ + ./gcc6.patch + ]; + cmakeFlags = [ "-DQT5_BUILD=ON" "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.0" diff --git a/pkgs/applications/video/k9copy/gcc6.patch b/pkgs/applications/video/k9copy/gcc6.patch new file mode 100644 index 000000000000..d0c9c2a8035e --- /dev/null +++ b/pkgs/applications/video/k9copy/gcc6.patch @@ -0,0 +1,26 @@ +diff --git c/src/backup/k9dvdbackup.cpp i/src/backup/k9dvdbackup.cpp +index f5e4859..82fa392 100755 +--- c/src/backup/k9dvdbackup.cpp ++++ i/src/backup/k9dvdbackup.cpp +@@ -907,7 +907,7 @@ k9Vobu * k9DVDBackup::remapOffset(uint32_t _sector,uint32_t *_offset,int _dir) { + + + if ((vobu1 !=NULL) && (vobu2!=NULL)) { +- *_offset = abs(vobu1->newSector - vobu2->newSector) | maskOffset1 ; ++ *_offset = (vobu1->newSector - vobu2->newSector) | maskOffset1 ; + *_offset |= maskOffset2; + return vobu2; + } +diff --git c/src/backup/k9execcopy.cpp i/src/backup/k9execcopy.cpp +index d59222c..35de923 100644 +--- c/src/backup/k9execcopy.cpp ++++ i/src/backup/k9execcopy.cpp +@@ -306,7 +306,7 @@ void k9ExecCopy::createMkv(k9DVDTitle *_title,const QString &_filename,QMultiMap + + #if QT_VERSION >= 0x050000 + m_progressDialog=new QProgressDialog(k9Dialogs::getMainWidget() ); +- m_progressDialog->setCancelButton(false); ++ m_progressDialog->setCancelButton(0); + + #else + m_progressDialog=new KProgressDialog(k9Dialogs::getMainWidget() ); |