Simplify iconv const patch

Author: petk

cmake/ext/iconv/CMakeLists.txt

@@ -300,8 +300,6 @@ if(TARGET Iconv::Iconv)
 
   if(PHP_EXT_ICONV_CONST)
     target_compile_definitions(php_ext_iconv PRIVATE ICONV_CONST=const)
-  else()
-    target_compile_definitions(php_ext_iconv PRIVATE ICONV_CONST=)
   endif()
 endif()
 

patches/8.3/iconv.patch

@@ -6,26 +6,23 @@ See:
 * https://github.com/php/php-src/pull/18933
 * https://github.com/php/php-src/pull/16847
 ---
- ext/iconv/iconv.c | 2 ++
- 1 file changed, 2 insertions(+)
+ ext/iconv/iconv.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
-index 8ac3bc9b3c4..f11b8d74c63 100644
+index 8ac3bc9b3c4..307188bc898 100644
 --- a/ext/iconv/iconv.c
 +++ b/ext/iconv/iconv.c
-@@ -44,6 +44,7 @@
+@@ -44,11 +44,7 @@
  #undef iconv
  #endif
 
+-#if defined(__NetBSD__)
+-// unfortunately, netbsd has still the old non posix conformant signature
+-// libiconv tends to match the eventual system's iconv too.
+-#define ICONV_CONST const
+-#else
 +#ifndef ICONV_CONST
- #if defined(__NetBSD__)
- // unfortunately, netbsd has still the old non posix conformant signature
- // libiconv tends to match the eventual system's iconv too.
-@@ -51,6 +52,7 @@
- #else
  #define ICONV_CONST
  #endif
-+#endif
 
- #include "zend_smart_str.h"
- #include "ext/standard/base64.h"

patches/8.4/iconv.patch

@@ -6,26 +6,23 @@ See:
 * https://github.com/php/php-src/pull/18933
 * https://github.com/php/php-src/pull/16847
 ---
- ext/iconv/iconv.c | 2 ++
- 1 file changed, 2 insertions(+)
+ ext/iconv/iconv.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
-index b61d253c5d4..53423e9ce49 100644
+index b61d253c5d4..64cf3e4d5dd 100644
 --- a/ext/iconv/iconv.c
 +++ b/ext/iconv/iconv.c
-@@ -43,6 +43,7 @@
+@@ -43,11 +43,7 @@
  #undef iconv
  #endif
 
+-#if defined(__NetBSD__)
+-// unfortunately, netbsd has still the old non posix conformant signature
+-// libiconv tends to match the eventual system's iconv too.
+-#define ICONV_CONST const
+-#else
 +#ifndef ICONV_CONST
- #if defined(__NetBSD__)
- // unfortunately, netbsd has still the old non posix conformant signature
- // libiconv tends to match the eventual system's iconv too.
-@@ -50,6 +51,7 @@
- #else
  #define ICONV_CONST
  #endif
-+#endif
 
- #include "zend_smart_str.h"
- #include "ext/standard/base64.h"

patches/8.5/iconv.patch

@@ -6,26 +6,23 @@ See:
 * https://github.com/php/php-src/pull/18933
 * https://github.com/php/php-src/pull/16847
 ---
- ext/iconv/iconv.c | 2 ++
- 1 file changed, 2 insertions(+)
+ ext/iconv/iconv.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
-index 2b19b1e3c78..3837c4b853c 100644
+index 2b19b1e3c78..aed1728f943 100644
 --- a/ext/iconv/iconv.c
 +++ b/ext/iconv/iconv.c
-@@ -43,6 +43,7 @@
+@@ -43,11 +43,7 @@
  #undef iconv
  #endif
 
+-#if defined(__NetBSD__) || (defined(__sun) && defined(__SVR4))
+-// unfortunately, netbsd has still the old non posix conformant signature
+-// libiconv tends to match the eventual system's iconv too.
+-#define ICONV_CONST const
+-#else
 +#ifndef ICONV_CONST
- #if defined(__NetBSD__) || (defined(__sun) && defined(__SVR4))
- // unfortunately, netbsd has still the old non posix conformant signature
- // libiconv tends to match the eventual system's iconv too.
-@@ -50,6 +51,7 @@
- #else
  #define ICONV_CONST
  #endif
-+#endif
 
- #include "zend_smart_str.h"
- #include "ext/standard/base64.h"