From da04a8e39741bbf336344b75b9842f2a7dc76ac1 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 6 Nov 2020 09:45:58 +0100 Subject: [PATCH] k9copy: remove for being broken since 2014 --- pkgs/applications/video/k9copy/default.nix | 63 ---------------------- pkgs/applications/video/k9copy/gcc6.patch | 26 --------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 pkgs/applications/video/k9copy/default.nix delete mode 100644 pkgs/applications/video/k9copy/gcc6.patch diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix deleted file mode 100644 index 317505185d0d..000000000000 --- a/pkgs/applications/video/k9copy/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, fetchurl -, cmake -, dvdauthor, xineLib, libmpeg2, libav, libdvdread, libdvdnav, dvdplusrwtools -, phonon, qtx11extras -, extra-cmake-modules, kio, kiconthemes, ki18n, kdesu, kdoctools, solid -}: - -stdenv.mkDerivation rec { - version = "3.0.3"; - pname = "k9copy"; - - src = fetchurl { - url = "mirror://sourceforge/k9copy-reloaded/${pname}-${version}.tar.gz"; - sha256 = "0dp06rwihks50c57bbv04d6bj2qc88isl91971r4lii2xp0qn7sg"; - }; - - patches = [ - ./gcc6.patch - ]; - - cmakeFlags = [ - "-DQT5_BUILD=ON" - "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.0" - ]; - - # Hack to disable documentation - preConfigure = '' - substituteInPlace ./CMakeLists.txt \ - --replace "add_subdirectory(doc)" "" - ''; - - buildInputs = [ - cmake - dvdauthor - xineLib - libmpeg2 - libav - libdvdread - libdvdnav - dvdplusrwtools - #automoc4 - phonon - extra-cmake-modules - kio - solid - qtx11extras - kiconthemes - ki18n - kdesu - ]; - nativeBuildInputs = [ kdoctools ]; - - meta = { - description = "DVD backup and DVD authoring program"; - homepage = "http://k9copy-reloaded.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ flosse ]; - platforms = stdenv.lib.platforms.unix; - # TODO: The software is deprecated and the build is broken, see: - # https://github.com/NixOS/nixpkgs/pull/63260#issuecomment-503506487 - broken = true; - }; -} diff --git a/pkgs/applications/video/k9copy/gcc6.patch b/pkgs/applications/video/k9copy/gcc6.patch deleted file mode 100644 index d0c9c2a8035e..000000000000 --- a/pkgs/applications/video/k9copy/gcc6.patch +++ /dev/null @@ -1,26 +0,0 @@ -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() ); diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f0150d8fb956..41024876d554 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -226,6 +226,7 @@ mapAliases ({ joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 + k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15 julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15 kdeconnect = kdeApplications.kdeconnect-kde; # added 2020-10-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b65557794448..fdbb26d24047 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21773,8 +21773,6 @@ in k3s = callPackage ../applications/networking/cluster/k3s {}; - k9copy = libsForQt514.callPackage ../applications/video/k9copy {}; - kail = callPackage ../tools/networking/kail { }; kanboard = callPackage ../applications/misc/kanboard { };