From 1d79af7853dfaa73a12ca5319f38abcde0716885 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 23 Nov 2024 21:08:06 +0000
Subject: [PATCH 1/3] jxrlib: 1.1 -> 1.2~git20170615.f752187-5.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use Debian’s source, which contains additional fixes.
---
 pkgs/by-name/jx/jxrlib/package.nix | 40 +++++++++++-------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/jx/jxrlib/package.nix b/pkgs/by-name/jx/jxrlib/package.nix
index 517746aa9b53..25840b510c49 100644
--- a/pkgs/by-name/jx/jxrlib/package.nix
+++ b/pkgs/by-name/jx/jxrlib/package.nix
@@ -1,34 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
+{ lib, stdenv, fetchFromGitLab, cmake, ninja, quilt }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "jxrlib";
-  version = "1.1";
+  version = "1.2~git20170615.f752187-5.2";
 
-  # Use the source from a fork on github because CodePlex does not
-  # deliver an easily downloadable tarball.
-  src = fetchFromGitHub {
-    owner = "4creators";
-    repo = pname;
-    rev = "f7521879862b9085318e814c6157490dd9dbbdb4";
-    sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w";
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "debian-phototools-team";
+    repo = "jxrlib";
+    rev = "56e10e601a962c2e8d178e60e52cd8cf2d50f9c0";
+    hash = "sha256-BX4kLlFk8AfouKE9KDyG1EFFYLFB/HqYQRxFdjAe2J8=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/df96f9b9c1fbe9cdc97589c337f8a948bc81c4d0/debian/patches/usecmake.patch";
-      sha256 = "sha256-BpCToLgA5856PZk5mXlwAy3Oh9aYP/2wvu2DXDTqufM=";
-    })
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/6c88037293aff8d5bc8a76ea32b36781c430ede3/debian/patches/bug803743.patch";
-      sha256 = "sha256-omIGa+ZrWjaH/IkBn4jgjufF/HEDKw69anVCX4hw+xQ=";
-    })
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/b23d49062ec6a9b2739c9dade86be525a72fc807/debian/patches/pkg-config.patch";
-      sha256 = "sha256-ZACaXEi+rbKIFBHtSBheyFfqV2HYsKKrT+SmTShyUhg=";
-    })
-  ];
-
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ninja quilt ];
 
   strictDeps = true;
 
@@ -36,6 +20,10 @@ stdenv.mkDerivation rec {
     NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
   };
 
+  postPatch = ''
+    QUILT_PATCHES=debian/patches quilt push -a
+  '';
+
   meta = with lib; {
     description = "Implementation of the JPEG XR image codec standard";
     homepage = "https://jxrlib.codeplex.com";

From 92d2131e251a90ed2640d93ccb7b1a49e48d11fa Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 23 Nov 2024 21:25:02 +0000
Subject: [PATCH 2/3] jxrlib: fix warning flags for GCC 14

---
 pkgs/by-name/jx/jxrlib/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/jx/jxrlib/package.nix b/pkgs/by-name/jx/jxrlib/package.nix
index 25840b510c49..982ccbf913f9 100644
--- a/pkgs/by-name/jx/jxrlib/package.nix
+++ b/pkgs/by-name/jx/jxrlib/package.nix
@@ -16,9 +16,10 @@ stdenv.mkDerivation {
 
   strictDeps = true;
 
-  env = lib.optionalAttrs stdenv.cc.isClang {
-    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
-  };
+  env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " (
+    [ "-Wno-error=implicit-function-declaration"]
+    ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=incompatible-pointer-types" ]
+  );
 
   postPatch = ''
     QUILT_PATCHES=debian/patches quilt push -a

From 353717d0b67284bd3a2a0969ec4928fd8281a312 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 23 Nov 2024 21:37:09 +0000
Subject: [PATCH 3/3] colmap: unpin Boost

---
 pkgs/applications/science/misc/colmap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix
index 59e58351c0f6..10d59e15d2f1 100644
--- a/pkgs/applications/science/misc/colmap/default.nix
+++ b/pkgs/applications/science/misc/colmap/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen,
+{ lib, fetchFromGitHub, cmake, boost, ceres-solver, eigen,
   freeimage, glog, libGLU, glew, qtbase,
   flann,
   cgal,
@@ -17,7 +17,7 @@
 assert cudaSupport -> cudaPackages != { };
 
 let
-  boost_static = boost179.override { enableStatic = true; };
+  boost_static = boost.override { enableStatic = true; };
   stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv;
 
   # TODO: migrate to redist packages