b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

k9copy: fix build with gcc6

Browse source
This commit is contained in:
Samuel Leathers 2017-08-30 14:54:10 -04:00 committed by Franz Pletz
parent 8211dfb200
commit d99d9026b3
2 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/video/k9copy/default.nix
View file

@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
sha256 = "0dp06rwihks50c57bbv04d6bj2qc88isl91971r4lii2xp0qn7sg";
};
patches = [
./gcc6.patch
];
cmakeFlags = [
"-DQT5_BUILD=ON"
"-DCMAKE_MINIMUM_REQUIRED_VERSION=3.0"

26
pkgs/applications/video/k9copy/gcc6.patch Normal file
View file

@ -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() );