From d2a0513c7bbae548c4b666aa0bd440de672c693e Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Sun, 5 Apr 2026 13:58:09 +0200
Subject: [PATCH] poco: 1.14.2 -> 1.15.1

changelog: https://github.com/pocoproject/poco/releases/tag/poco-1.15.1-release

diff: https://github.com/pocoproject/poco/compare/poco-1.14.2-release...poco-1.15.1-release
---
 .../by-name/po/poco/disable-flaky-tests.patch | 18 ----------
 pkgs/by-name/po/poco/package.nix              | 33 +++++++------------
 2 files changed, 12 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/by-name/po/poco/disable-flaky-tests.patch

diff --git a/pkgs/by-name/po/poco/disable-flaky-tests.patch b/pkgs/by-name/po/poco/disable-flaky-tests.patch
deleted file mode 100644
index 4f3b6ca5833e..000000000000
--- a/pkgs/by-name/po/poco/disable-flaky-tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/Foundation/testsuite/src/ExpireLRUCacheTest.cpp b/Foundation/testsuite/src/ExpireLRUCacheTest.cpp
---- a/Foundation/testsuite/src/ExpireLRUCacheTest.cpp
-+++ b/Foundation/testsuite/src/ExpireLRUCacheTest.cpp
-@@ -336 +336 @@
--	CppUnit_addTest(pSuite, ExpireLRUCacheTest, testExpireN);
-+	// CppUnit_addTest(pSuite, ExpireLRUCacheTest, testExpireN);
-diff --git a/Foundation/testsuite/src/TimestampTest.cpp b/Foundation/testsuite/src/TimestampTest.cpp
---- a/Foundation/testsuite/src/TimestampTest.cpp
-+++ b/Foundation/testsuite/src/TimestampTest.cpp
-@@ -97 +97 @@
--	CppUnit_addTest(pSuite, TimestampTest, testTimestamp);
-+	// CppUnit_addTest(pSuite, TimestampTest, testTimestamp);
-diff --git a/Foundation/testsuite/src/UniqueExpireCacheTest.cpp b/Foundation/testsuite/src/UniqueExpireCacheTest.cpp
---- a/Foundation/testsuite/src/UniqueExpireCacheTest.cpp
-+++ b/Foundation/testsuite/src/UniqueExpireCacheTest.cpp
-@@ -248 +248 @@
--	CppUnit_addTest(pSuite, UniqueExpireCacheTest, testExpireN);
-+	// CppUnit_addTest(pSuite, UniqueExpireCacheTest, testExpireN);
diff --git a/pkgs/by-name/po/poco/package.nix b/pkgs/by-name/po/poco/package.nix
index 9183abea2921..a0aad31cf36e 100644
--- a/pkgs/by-name/po/poco/package.nix
+++ b/pkgs/by-name/po/poco/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   nix-update-script,
   pkg-config,
@@ -14,19 +13,20 @@
   openssl,
   unixodbc,
   libmysqlclient,
+  libpng,
   writableTmpDirAsHomeHook,
 }:
 
 stdenv.mkDerivation rec {
   pname = "poco";
 
-  version = "1.14.2";
+  version = "1.15.1";
 
   src = fetchFromGitHub {
     owner = "pocoproject";
     repo = "poco";
-    hash = "sha256-koREkrfAHWfpqITN5afiXwZg37Wve2Ftx8sr8t2bSV4=";
-    rev = "poco-${version}-release";
+    hash = "sha256-JyjEs5aecKSdrNEaSs4Dzs3mAu2rhhBNAG93VLHdU3E=";
+    tag = "poco-${version}-release";
   };
 
   nativeBuildInputs = [
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     unixodbc
     libmysqlclient
+    libpng
   ];
 
   propagatedBuildInputs = [
@@ -79,23 +80,13 @@ stdenv.mkDerivation rec {
       (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'${excludeTestsRegex}'")
     ];
 
-  patches = [
-    # Remove on next release
-    (fetchpatch {
-      name = "disable-included-pcre-if-pcre-is-linked-staticly";
-      # this happens when building pkgsStatic.poco
-      url = "https://patch-diff.githubusercontent.com/raw/pocoproject/poco/pull/4879.patch";
-      hash = "sha256-VFWuRuf0GPYFp43WKI8utl+agP+7a5biLg7m64EMnVo=";
-    })
-    # https://github.com/pocoproject/poco/issues/4977
-    ./disable-flaky-tests.patch
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    ./disable-broken-tests-darwin.patch
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    ./disable-broken-tests-linux.patch
-  ];
+  patches =
+    lib.optionals stdenv.hostPlatform.isDarwin [
+      ./disable-broken-tests-darwin.patch
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      ./disable-broken-tests-linux.patch
+    ];
 
   doCheck = true;
   nativeCheckInputs = [