diff options
| author | Remi Collet <remi@remirepo.net> | 2025-02-19 17:08:20 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-02-19 17:08:20 +0100 |
| commit | e881c254c4c3bd82707f4e3102334039bfede680 (patch) | |
| tree | 8bbdbd2d0e2c688f05aed0bb8d84f1bb8dd8a580 | |
| parent | 258d150cfaa4add4c5b0fd311b018a3c34983e86 (diff) | |
fix build with GCC 15 using patch from
https://github.com/SeasX/SeasClick/pull/18
| -rw-r--r-- | 18.patch | 21 | ||||
| -rw-r--r-- | php-pecl-seasclick.spec | 42 |
2 files changed, 36 insertions, 27 deletions
diff --git a/18.patch b/18.patch new file mode 100644 index 0000000..e211305 --- /dev/null +++ b/18.patch @@ -0,0 +1,21 @@ +From 0673b2174b857b89d26f79ca6e0d28f7115982ab Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 19 Feb 2025 17:01:48 +0100 +Subject: [PATCH] fix #17 add missing <cstdint> include + +--- + lib/clickhouse-cpp/clickhouse/types/types.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/clickhouse-cpp/clickhouse/types/types.h b/lib/clickhouse-cpp/clickhouse/types/types.h +index e8d6c99..d9387a5 100644 +--- a/lib/clickhouse-cpp/clickhouse/types/types.h ++++ b/lib/clickhouse-cpp/clickhouse/types/types.h +@@ -4,6 +4,7 @@ + #include <memory> + #include <string> + #include <vector> ++#include <cstdint> + + namespace clickhouse { + diff --git a/php-pecl-seasclick.spec b/php-pecl-seasclick.spec index 5c7f69a..3dd42eb 100644 --- a/php-pecl-seasclick.spec +++ b/php-pecl-seasclick.spec @@ -1,8 +1,8 @@ # remirepo spec file for php-pecl-seasclick # -# Copyright (c) 2019-2023 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2019-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -27,11 +27,13 @@ Summary: An Yandex ClickHouse client driven extension for PHP Name: %{?scl_prefix}php-pecl-%{lowername} Version: 0.1.1 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: Apache-2.0 URL: https://pecl.php.net/package/%{proj_name} Source0: https://pecl.php.net/get/%{sources}.tgz +Patch0: 18.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ @@ -61,10 +63,12 @@ cp %{sources}/lib/clickhouse-cpp/LICENSE %{sources}/LICENSE.clickhouse-cpp # Don't install tests sed -e 's/role="test"/role="src"/' \ - %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ + -e '/LICENSE/s/role="doc"/role="src"/' \ -i package.xml cd %{sources} +%patch -P0 -p1 -b .pr18 + : Sanity check, really often broken extver=$(sed -n '/#define PHP_SEASCLICK_VERSION /{s/.* "//;s/".*$//;p}' php_SeasClick.h) if test "x${extver}" != "x%{version}"; then @@ -155,30 +159,9 @@ REPORT_EXIT_STATUS=1 \ %endif - -%if 0%{?fedora} < 24 && 0%{?rhel} < 8 -# when pear installed alone, after us -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{proj_name} >/dev/null || : -fi -%endif - - %files %doc %{pecl_docdir}/%{pecl_name} -%{?_licensedir:%license %{sources}/LICENSE*} +%license %{sources}/LICENSE* %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{ini_name} @@ -191,6 +174,11 @@ fi %changelog +* Wed Feb 19 2025 Remi Collet <remi@remirepo.net> - 0.1.1-3 +- re-license spec file to CECILL-2.1 +- fix build with GCC 15 using patch from + https://github.com/SeasX/SeasClick/pull/18 + * Fri Sep 1 2023 Remi Collet <remi@remirepo.net> - 0.1.1-2 - build out of sources tree |