From 3c66f6be484daa0e822a48726c3231bfe8b094a2 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 3 Mar 2026 07:09:52 +0100
Subject: update to 6.2.0RC2

drop patch merged upstream
---
 6013.patch | 46 ----------------------------------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 6013.patch

(limited to '6013.patch')

diff --git a/6013.patch b/6013.patch
deleted file mode 100644
index 6ee45b4..0000000
--- a/6013.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 06c7656c218c284bbb793a18a54ef221f125335c Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 27 Feb 2026 10:29:56 +0100
-Subject: [PATCH] Fix #6004 drop broken conditionals, PHP_VERSION_ID not
- defined
-
----
- thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp | 2 --
- thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp | 3 ---
- 2 files changed, 5 deletions(-)
-
-diff --git a/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp b/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp
-index 2c07099252..715963eec1 100644
---- a/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp
-+++ b/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp
-@@ -18,7 +18,6 @@
- #include <firebird/Interface.h>
- #include <cstring>
- 
--#if PHP_VERSION_ID < 80500
- /* Returns the client version. 0 bytes are minor version, 1 bytes are major version. */
- extern "C" unsigned fb_get_client_version(void)
- {
-@@ -90,4 +89,3 @@ extern "C" ISC_STATUS fb_decode_timestamp_tz(ISC_STATUS* isc_status, const ISC_T
- }
- 
- #endif
--#endif
-diff --git a/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp b/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp
-index 1398b42260..715963eec1 100644
---- a/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp
-+++ b/thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp
-@@ -18,8 +18,6 @@
- #include <firebird/Interface.h>
- #include <cstring>
- 
--#if PHP_VERSION_ID >= 80500
--
- /* Returns the client version. 0 bytes are minor version, 1 bytes are major version. */
- extern "C" unsigned fb_get_client_version(void)
- {
-@@ -91,4 +89,3 @@ extern "C" ISC_STATUS fb_decode_timestamp_tz(ISC_STATUS* isc_status, const ISC_T
- }
- 
- #endif
--#endif
-- 
cgit