test build for https://github.com/NoiseByNorthwest/php-spx/pull/295

  add --with-spx-assets-dir configure option

2 files changed, 59 insertions, 1 deletions

diff --git a/295.patch b/295.patch
new file mode 100644
index 0000000..fbaae6b
--- /dev/null
+++ b/295.patch
@@ -0,0 +1,49 @@
+From e77fc1d145337b92d4ad940bdb212554e97eba62 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 30 Jun 2025 11:25:34 +0200
+Subject: [PATCH] Fix #294 add --with-spx-assets-dir configure options
+
+---
+ Makefile.frag | 9 +++------
+ config.m4     | 7 +++++++
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.frag b/Makefile.frag
+index 9f3ae0b..c899753 100644
+--- a/Makefile.frag
++++ b/Makefile.frag
+@@ -1,11 +1,8 @@
+ 
+-spx_ui_assets_dir = $(INSTALL_ROOT)$(prefix)/share/misc/php-spx/assets/web-ui
+-
+-CFLAGS += -DSPX_HTTP_UI_ASSETS_DIR=\"$(spx_ui_assets_dir)\"
+ 
+ install-spx-ui-assets:
+-	@echo "Installing SPX web UI to: $(spx_ui_assets_dir)"
+-	@mkdir -p $(spx_ui_assets_dir)
+-	@cp -r assets/web-ui/* $(spx_ui_assets_dir)
++	@echo "Installing SPX web UI to: $(INSTALL_ROOT)$(PHP_SPX_ASSETS_DIR)/web-ui"
++	@mkdir -p $(INSTALL_ROOT)$(PHP_SPX_ASSETS_DIR)/web-ui
++	@cp -r assets/web-ui/* $(INSTALL_ROOT)$(PHP_SPX_ASSETS_DIR)/web-ui
+ 
+ install: $(all_targets) $(install_targets) install-spx-ui-assets
+diff --git a/config.m4 b/config.m4
+index e6fc9a1..2e8d7bd 100644
+--- a/config.m4
++++ b/config.m4
+@@ -9,8 +9,15 @@ PHP_ARG_WITH(zlib-dir, for ZLIB,
+ [  --with-zlib-dir[=DIR]   Set the path to ZLIB install prefix.], no)
+ fi
+ 
++PHP_ARG_WITH(spx-assets-dir, for assets path,
++[  --with-spx-assets-dir[=DIR]   Set the installation path of assets.], $prefix/share/misc/php-spx/assets)
++
+ if test "$PHP_SPX" = "yes"; then
+     AC_DEFINE(HAVE_SPX, 1, [spx])
++    AC_MSG_CHECKING([for assets directory])
++    AC_MSG_RESULT([ $PHP_SPX_ASSETS_DIR ])
++    AC_DEFINE_UNQUOTED([SPX_HTTP_UI_ASSETS_DIR], [ "$PHP_SPX_ASSETS_DIR/web-ui" ], [path of web-ui assets directory])
++    PHP_SUBST([PHP_SPX_ASSETS_DIR])
+ 
+     CFLAGS="-Werror -Wall -O3 -pthread -std=gnu90"
+ 
diff --git a/php-noisebynorthwest-php-spx.spec b/php-noisebynorthwest-php-spx.spec
index 6285d37..1f49d36 100644
--- a/php-noisebynorthwest-php-spx.spec
+++ b/php-noisebynorthwest-php-spx.spec
@@ -32,7 +32,7 @@ Summary:        PHP profiling extension
 Name:           %{?scl_prefix}php-%{pie_vend}-%{pie_proj}
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 %forgemeta
-Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 # GPL-3.0-only: php-spx
 # GPL-3.0-or-later: jscolor.js dataTable.js fmt.js layoutSplitter.js math.js profileData.js svg.js utils.js widget.js 
 # MIT: jquery
@@ -40,6 +40,8 @@ License:        GPL-3.0-only AND GPL-3.0-or-later AND MIT
 URL:            %{forgeurl}
 Source0:        %{forgesource}
 
+Patch0:         https://patch-diff.githubusercontent.com/raw/NoiseByNorthwest/php-spx/pull/295.patch
+
 BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  zlib-devel
@@ -90,6 +92,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %prep
 %forgesetup
 
+%patch -P0 -p1
+
 : Sanity check, really often broken
 extver=$(sed -n '/#define PHP_SPX_VERSION/{s/.* "//;s/".*$//;p}' src/php_spx.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -129,6 +133,7 @@ sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL Makefile.frag
 %configure \
     --enable-spx \
     --with-libdir=%{_lib} \
+    --with-spx-assets-dir=%{_datadir}/%{name}/assets \
     --with-php-config=%{__phpconfig}
 
 %make_build
@@ -165,5 +170,9 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_extdir}/%{ext_name}.so" \
 
 
 %changelog
+* Mon Jun 30 2025 Remi Collet <remi@remirepo.net> - 0.4.19-2
+- test build for https://github.com/NoiseByNorthwest/php-spx/pull/295
+  add --with-spx-assets-dir configure option
+
 * Mon Jun 30 2025 Remi Collet <remi@remirepo.net> - 0.4.19-1
 - initial package