From 387e0073f11c86c7b8ca6471fe2d153670bdd1c1 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 26 May 2022 01:23:54 +0200
Subject: [PATCH] fbreader: remove

---
 pkgs/applications/misc/fbreader/default.nix   | 94 -------------------
 .../misc/fbreader/typecheck.patch             | 11 ---
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 -
 4 files changed, 1 insertion(+), 109 deletions(-)
 delete mode 100644 pkgs/applications/misc/fbreader/default.nix
 delete mode 100644 pkgs/applications/misc/fbreader/typecheck.patch

diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix
deleted file mode 100644
index c684d273bc75..000000000000
--- a/pkgs/applications/misc/fbreader/default.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch
-, pkg-config
-, bzip2
-, curl
-, expat
-, fribidi
-, libunibreak
-, sqlite
-, zlib
-, uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx"
-, uiType ? if !stdenv.isDarwin then "qt4" else "cocoa"
-, qt4
-, gtk2
-, AppKit
-, Cocoa
-}:
-
-with lib;
-
-assert elem uiTarget [ "desktop" "macosx" ];
-assert elem uiType [ "qt4" "gtk" "cocoa" ];
-assert uiTarget == "macosx" -> uiType == "cocoa";
-
-# Note: "qt" uiType option mentioned in ${src}/README.build is qt3,
-# which is way to old and no longer in nixpkgs.
-
-stdenv.mkDerivation {
-  pname = "fbreader-${uiType}";
-  version = "0.99.6";
-
-  src = fetchFromGitHub {
-    owner = "geometer";
-    repo = "FBReader";
-    rev = "9e608db14372ae580beae4976eec7241fa069e75";
-    sha256 = "0lzafk02mv0cf2l2a61q5y4743zi913byik4bw1ix0gr1drnsa7y";
-  };
-
-  patches = [
-    ./typecheck.patch
-    (fetchpatch {
-      name = "curl-7_62.diff"; # see https://github.com/geometer/FBReader/pull/311
-      url = "https://github.com/geometer/FBReader/commit/b7c78e965d06f780.diff";
-      sha256 = "1dgnx9wps7hcf8fkidc7037vcf92fr3ccnjx7bgxm9x02j0hngjg";
-    })
-  ];
-
-  postPatch = ''
-    cat << EOF > makefiles/target.mk
-    TARGET_ARCH = ${uiTarget}
-    TARGET_STATUS = release
-    UI_TYPE = ${uiType}
-    EOF
-
-    substituteInPlace makefiles/arch/desktop.mk \
-      --replace ccache "" \
-      --replace moc-qt4 moc
-
-    # libunibreak supersedes liblinebreak
-    substituteInPlace zlibrary/text/Makefile \
-      --replace -llinebreak -lunibreak
-  '';
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    bzip2
-    curl
-    expat
-    fribidi
-    libunibreak
-    sqlite
-    zlib
-  ]
-  ++ optional (uiType == "qt4") qt4
-  ++ optional (uiType == "gtk") gtk2
-  ++ optionals (uiType == "cocoa") [ AppKit Cocoa ];
-
-  makeFlags = [ "INSTALLDIR=$(out)" ];
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";
-
-  meta = with lib; {
-    description = "An e-book reader for Linux";
-    homepage = "http://www.fbreader.org/";
-    license = licenses.gpl3;
-    broken = stdenv.isDarwin  # untested, might work
-      || uiType == "gtk"; # builds, but the result is unusable, hangs a lot
-    platforms = platforms.unix;
-    maintainers = [ maintainers.coroa ];
-  };
-}
diff --git a/pkgs/applications/misc/fbreader/typecheck.patch b/pkgs/applications/misc/fbreader/typecheck.patch
deleted file mode 100644
index cbac290e69c2..000000000000
--- a/pkgs/applications/misc/fbreader/typecheck.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/fbreader/src/database/booksdb/BooksDB.cpp b/fbreader/src/database/booksdb/BooksDB.cpp
-index e33a22e76..1b6092800 100644
---- a/fbreader/src/database/booksdb/BooksDB.cpp
-+++ b/fbreader/src/database/booksdb/BooksDB.cpp
-@@ -146,5 +146,5 @@ shared_ptr<Book> BooksDB::loadBook(const std::string &fileName) {
- 	myFindFileId->setFileName(fileName);
- 	if (!myFindFileId->run()) {
--		return false;
-+		return 0;
- 	}
- 	((DBIntValue&)*myLoadBook->parameter("@file_id").value()) = myFindFileId->fileId();
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 90cd965a4b1d..aa6ce1394a63 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -408,6 +408,7 @@ mapAliases ({
   facette = throw "facette has been removed"; # Added 2020-01-06
   fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # Added 2020-03-28
   fastnlo = fastnlo_toolkit; # Added 2021-04-24
+  fbreader = throw "fbreader has been removed, as the upstream project has been archived"; # Added 2022-05-26
   fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'"; # Added 2021-04-13
   feedreader = throw "feedreader is no longer activily maintained since 2019. The developer is working on a spiritual successor called NewsFlash."; # Added 2022-05-03
   fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8eb00942be8..5920df1e2fcb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26809,10 +26809,6 @@ with pkgs;
 
   fbpanel = callPackage ../applications/window-managers/fbpanel { };
 
-  fbreader = callPackage ../applications/misc/fbreader {
-    inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
-  };
-
   fdr = libsForQt5.callPackage ../applications/science/programming/fdr { };
 
   feedbackd = callPackage ../applications/misc/feedbackd { };