Merge pull request #220497 from wegank/photoflow-drop

photoflow: drop

pkgs/applications/graphics/photoflow/CMakeLists.patch

@@ -1,13 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9b48beea..078ba20d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -603,7 +603,7 @@ ENDIF(APPLE)
- #
- # photoflow executable
- #
--add_executable(photoflow main.cc ${RESOURCE_OBJECT})
-+add_executable(photoflow main.cc version.cc ${RESOURCE_OBJECT})
- IF(APPLE)
-   set_target_properties(photoflow PROPERTIES LINK_FLAGS " -framework ApplicationServices ")
- ENDIF(APPLE)

pkgs/applications/graphics/photoflow/default.nix

@@ -1,101 +0,0 @@
-{ automake
-, cmake
-, exiv2
-, expat
-, fetchFromGitHub
-, fetchpatch
-, fftw
-, fftwFloat
-, gettext
-, glib
-, gobject-introspection
-, gtkmm2
-, lcms2
-, lensfun
-, libexif
-, libiptcdata
-, libjpeg
-, libraw
-, libtiff
-, libxml2
-, ninja
-, openexr
-, pcre
-, pkg-config
-, pugixml
-, lib
-, stdenv
-, swig
-, vips
-, gtk-mac-integration-gtk2
-}:
-
-stdenv.mkDerivation rec {
-  pname = "photoflow";
-  version = "2020-08-28";
-
-  src = fetchFromGitHub {
-    owner = "aferrero2707";
-    repo = pname;
-    rev = "8472024fb91175791e0eb23c434c5b58ecd250eb";
-    sha256 = "1bq4733hbh15nwpixpyhqfn3bwkg38amdj2xc0my0pii8l9ln793";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "fix-compiler-flags.patch";
-      url = "https://sources.debian.org/data/main/p/photoflow/0.2.8%2Bgit20200114-3/debian/patches/ftbfs";
-      sha256 = "sha256-DG5yG6M4FsKOykE9Eh5TGd7Z5QURGTTVbO1pIxMAlhc=";
-    })
-    ./CMakeLists.patch
-    ./fix-build.patch
-  ];
-
-  nativeBuildInputs = [
-    automake
-    cmake
-    gettext
-    glib
-    gobject-introspection
-    libxml2
-    ninja
-    pkg-config
-    swig
-  ];
-
-  buildInputs = [
-    exiv2
-    expat
-    fftw
-    fftwFloat
-    gtkmm2 # Could be build with gtk3 but proper UI theme is missing and therefore not very usable with gtk3
-    # See: https://discuss.pixls.us/t/help-needed-for-gtk3-theme/5803
-    lcms2
-    lensfun
-    libexif
-    libiptcdata
-    libjpeg
-    libraw
-    libtiff
-    openexr
-    pcre
-    pugixml
-    vips
-  ] ++ lib.optionals stdenv.isDarwin [
-    gtk-mac-integration-gtk2
-  ];
-
-  cmakeFlags = [
-    "-DBUNDLED_EXIV2=OFF"
-    "-DBUNDLED_LENSFUN=OFF"
-    "-DBUNDLED_GEXIV2=OFF"
-  ];
-
-  meta = with lib; {
-    description = "A fully non-destructive photo retouching program providing a complete RAW image editing workflow";
-    homepage = "https://aferrero2707.github.io/PhotoFlow/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ MtP wegank ];
-    platforms = platforms.unix;
-  };
-}

pkgs/applications/graphics/photoflow/fix-build.patch

@@ -1,76 +0,0 @@
-diff --git a/src/external/librtprocess/src/include/librtprocess.h b/src/external/librtprocess/src/include/librtprocess.h
-index 47691a09..b1c63dbd 100644
---- a/src/external/librtprocess/src/include/librtprocess.h
-+++ b/src/external/librtprocess/src/include/librtprocess.h
-@@ -21,6 +21,7 @@
- #define _LIBRTPROCESS_
- 
- #include <functional>
-+#include <cstddef>
- 
- 
- enum rpError {RP_NO_ERROR, RP_MEMORY_ERROR, RP_WRONG_CFA, RP_CACORRECT_ERROR};
-diff --git a/src/operations/denoise.cc b/src/operations/denoise.cc
-index 10050f70..16b340c1 100644
---- a/src/operations/denoise.cc
-+++ b/src/operations/denoise.cc
-@@ -27,7 +27,7 @@
- 
-  */
- 
--#include <vips/cimg_funcs.h>
-+//#include <vips/cimg_funcs.h>
- 
- #include "../base/new_operation.hh"
- #include "convert_colorspace.hh"
-diff --git a/src/operations/gmic/gmic.cc b/src/operations/gmic/gmic.cc
-index 876e7c20..fc6a8505 100644
---- a/src/operations/gmic/gmic.cc
-+++ b/src/operations/gmic/gmic.cc
-@@ -28,13 +28,31 @@
-  */
- 
- //#include <vips/cimg_funcs.h>
-+#include <vips/vips.h>
- 
- #include "../../base/processor_imp.hh"
- #include "../convertformat.hh"
- #include "gmic.hh"
- 
--int vips_gmic(VipsImage **in, VipsImage** out, int n, int padding, double x_scale, double y_scale, const char* command, ...);
--
-+int vips_gmic(VipsImage **in, VipsImage** out, int n, int padding, double x_scale, double y_scale, const char* command, ...)
-+{
-+	VipsArrayImage *array; 
-+	va_list ap;
-+	int result;
-+
-+#ifndef NDEBUG
-+	printf("vips_gmic(): padding=%d\n", padding);
-+#endif
-+
-+	array = vips_array_image_new( in, n ); 
-+	va_start( ap, command );
-+	result = vips_call_split( "gmic", ap, array, out, 
-+		padding, x_scale, y_scale, command );
-+	va_end( ap );
-+	vips_area_unref( VIPS_AREA( array ) );
-+
-+	return( result );
-+}
- 
- PF::GMicPar::GMicPar(): 
-   OpParBase(),
-diff --git a/src/vips/gmic/gmic/src/CImg.h b/src/vips/gmic/gmic/src/CImg.h
-index 268b9e62..5a79640c 100644
---- a/src/vips/gmic/gmic/src/CImg.h
-+++ b/src/vips/gmic/gmic/src/CImg.h
-@@ -32843,7 +32843,7 @@ namespace cimg_library_suffixed {
-        \see deriche(), vanvliet().
-     **/
-     CImg<T>& blur_box(const float boxsize, const bool boundary_conditions=true) {
--      const float nboxsize = boxsize>=0?boxsize:-boxsize*std::max(_width,_height,_depth)/100;
-+      const float nboxsize = boxsize>=0?boxsize:-boxsize*std::max({_width,_height,_depth})/100;
-       return blur_box(nboxsize,nboxsize,nboxsize,boundary_conditions);
-     }
- 

pkgs/top-level/aliases.nix

@@ -1154,6 +1154,7 @@ mapAliases ({
   phantomjs2 = throw "phantomjs2 has been dropped due to lack of maintenance"; # Added 2022-04-22
   philter = throw "philter has been removed: abandoned by upstream"; # Added 2022-04-26
   phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21
+  photoflow = throw "photoflow was removed because it was broken and unmaintained by upstream"; # Added 2023-03-10
   phraseapp-client = throw "phraseapp-client is archived by upstream. Use phrase-cli instead"; # Added 2022-05-15
   phwmon = throw "phwmon has been removed: abandoned by upstream"; # Added 2022-04-24
 

pkgs/top-level/all-packages.nix

@@ -32491,8 +32491,6 @@ with pkgs;
 
   photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { };
 
-  photoflow = callPackage ../applications/graphics/photoflow { };
-
   phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { };
 
   phrasendrescher = callPackage ../tools/security/phrasendrescher { };