summary refs log tree commit diff
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2022-03-31 22:04:43 +0200
committerajs124 <git@ajs124.de>2022-04-03 16:14:59 +0100
commitf75ec63a9bb37372c7bb5350be178ef24b63a00b (patch)
tree7c5517fd2f79c49eaca58bf74a05d9837052a998
parent63828897eb7680347f66fcc218f0d44677d8338b (diff)
downloadnixpkgs-f75ec63a9bb37372c7bb5350be178ef24b63a00b.tar
nixpkgs-f75ec63a9bb37372c7bb5350be178ef24b63a00b.tar.gz
nixpkgs-f75ec63a9bb37372c7bb5350be178ef24b63a00b.tar.bz2
nixpkgs-f75ec63a9bb37372c7bb5350be178ef24b63a00b.tar.lz
nixpkgs-f75ec63a9bb37372c7bb5350be178ef24b63a00b.tar.xz
nixpkgs-f75ec63a9bb37372c7bb5350be178ef24b63a00b.tar.zst
nixpkgs-f75ec63a9bb37372c7bb5350be178ef24b63a00b.zip
photivo: remove after being marked broken for over two years
It was marked in commit e186ad5c31739f69d083412dbf22d5e9959f9a6d by worldofpeace on 2019-06-27 (commited on 2019-06-27)
-rw-r--r--pkgs/applications/graphics/photivo/default.nix54
-rw-r--r--pkgs/applications/graphics/photivo/gcc6.patch13
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 0 insertions, 69 deletions
diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
deleted file mode 100644
index 338f716e9bb..00000000000
--- a/pkgs/applications/graphics/photivo/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ lib
-, stdenv
-, fetchhg
-, fetchpatch
-, cmake
-, qt4
-, fftw
-, graphicsmagick_q16
-, lcms2
-, lensfun
-, pkg-config
-, libjpeg
-, exiv2
-, liblqr1
-}:
-
-stdenv.mkDerivation {
-  pname = "photivo";
-  version = "2014-01-25";
-
-  src = fetchhg {
-    url = "http://code.google.com/p/photivo/";
-    rev = "d687864489da";
-    sha256 = "0f6y18k7db2ci6xn664zcwm1g1k04sdv7gg1yd5jk41bndjb7z8h";
-  };
-
-  patches = [
-    # Patch fixing build with lensfun >= 0.3, taken from
-    # https://www.linuxquestions.org/questions/slackware-14/photivo-4175530230/#post5296578
-    (fetchpatch {
-      url = "https://www.linuxquestions.org/questions/attachment.php?attachmentid=17287&d=1420577220";
-      name = "lensfun-0.3.patch";
-      sha256 = "0ys45x4r4bjjlx0zpd5d56rgjz7k8gxili4r4k8zx3zfka4a3zwv";
-    })
-    ./gcc6.patch
-  ];
-
-  postPatch = '' # kinda icky
-    sed -e '/("@INSTALL@")/d' \
-        -e s,@INSTALL@,$out/share/photivo, \
-        -i Sources/ptSettings.cpp
-    sed '1i#include <math.h>' -i Sources/filters/ptFilter_StdCurve.cpp
-  '';
-
-  nativeBuildInputs = [ cmake pkg-config ];
-
-  buildInputs = [ qt4 fftw graphicsmagick_q16 lcms2 lensfun libjpeg exiv2 liblqr1 ];
-
-  meta = with lib; {
-    platforms = platforms.linux;
-    license = licenses.gpl3;
-    broken = true; # exiv2 0.27.1 FTBFS
-  };
-}
diff --git a/pkgs/applications/graphics/photivo/gcc6.patch b/pkgs/applications/graphics/photivo/gcc6.patch
deleted file mode 100644
index e2eb795fc8e..00000000000
--- a/pkgs/applications/graphics/photivo/gcc6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git c/Sources/ptImage.cpp i/Sources/ptImage.cpp
-index 9c95093..623c157 100755
---- c/Sources/ptImage.cpp
-+++ i/Sources/ptImage.cpp
-@@ -5291,7 +5291,7 @@ ptImage* ptImage::Box(const uint16_t MaxRadius, float* Mask) {
-         NewRow = NewRow < 0? -NewRow : NewRow > Height1? Height1_2-NewRow : NewRow ;

-         NewRow *= m_Width;

-         for(j = -IntRadius; j <= IntRadius; j++) {

--          if (Dist[abs(i)][abs(j)] < Radius) {

-+          if (Dist[int16_t(abs(i))][int16_t(abs(j))] < Radius) {

-             NewCol = Col+j;

-             NewCol = NewCol < 0? -NewCol : NewCol > Width1? Width1_2-NewCol : NewCol ;

- 

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f38585c041..545eb4e466a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25981,8 +25981,6 @@ with pkgs;
 
   gjay = callPackage ../applications/audio/gjay { };
 
-  photivo = callPackage ../applications/graphics/photivo { };
-
   rhythmbox = callPackage ../applications/audio/rhythmbox { };
 
   gradio = callPackage ../applications/audio/gradio { };