diff --git a/ChangeLog.txt b/ChangeLog.txt index e5981a7de6..a372b2bbe6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,11 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2025-12-10 22:37 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * README.md + * package/harbour.spec + + added --with localpng RPM build switch + 2025-12-10 22:22 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/rtl/cdpapi.c ! added missing variable initialization diff --git a/README.md b/README.md index 7c2d828352..f13b28d019 100644 --- a/README.md +++ b/README.md @@ -394,6 +394,8 @@ You can fine-tune the build with these options: --with pgsql - build components dependent on pgsql (hbpgsql, sddpg) --with localzlib - build local copy of zlib library --with localpcre - build local copy of pcre library + --with localpng - build local copy of png library + --with localbz2 - build local copy of bz2 library --without x11 - do not build components dependent on x11 (gtxwc) --without curses - do not build components dependent on curses (gtcrs) --without slang - do not build components dependent on slang (gtsln) diff --git a/package/harbour.spec b/package/harbour.spec index 64c104ff34..db86cf0fa8 100644 --- a/package/harbour.spec +++ b/package/harbour.spec @@ -70,7 +70,7 @@ %define hb_sln export HB_WITH_SLANG=%{!?_without_slang:yes}%{?_without_slang:no} %define hb_x11 export HB_WITH_X11=%{!?_without_x11:yes}%{?_without_x11:no} %define hb_ssl export HB_WITH_OPENSSL=%{?_with_openssl:yes}%{!?_with_openssl:no} -%define hb_local export HB_WITH_ZLIB=%{?_with_localzlib:local} ; export HB_WITH_PCRE=%{?_with_localpcre:local} ; export HB_WITH_BZIP2=%{?_with_localbz2:local} +%define hb_local export HB_WITH_ZLIB=%{?_with_localzlib:local} ; export HB_WITH_PCRE=%{?_with_localpcre:local} ; export HB_WITH_PNG=%{?_with_localpng:local} ; export HB_WITH_BZIP2=%{?_with_localbz2:local} %define hb_proot export HB_INSTALL_PKG_ROOT=${RPM_BUILD_ROOT} %define hb_bdir export HB_INSTALL_BIN=${RPM_BUILD_ROOT}%{_bindir} %define hb_ldir export HB_INSTALL_LIB=${RPM_BUILD_ROOT}%{_libdir}/%{name} @@ -410,11 +410,11 @@ make install %{?_smp_mflags} %{?_without_slang:rm -f $HB_INSTALL_LIB/libgtsln.a} %{!?_with_openssl:rm -f $HB_INSTALL_LIB/libhbssl.a} %{!?_with_localbz2:rm -f $HB_INSTALL_LIB/libbz2.a} +%{!?_with_localpng:rm -f $HB_INSTALL_LIB/libpng.a} %{!?hb_ldconf:rm -fR $HB_INSTALL_ETC/ld.so.conf.d} %{?hb_ldconf:rm -f $RPM_BUILD_ROOT/%{_libdir}/*.so*} rm -f $RPM_BUILD_ROOT/%{_bindir}/{3rdpatch.hb,check.hb,commit.hb,harbour.ucf} rm -f $HB_INSTALL_LIB/libjpeg.a \ - $HB_INSTALL_LIB/libpng.a \ $HB_INSTALL_LIB/liblibhpdf.a \ $HB_INSTALL_LIB/libsqlite3.a \ $HB_INSTALL_LIB/libexpat.a \ @@ -487,6 +487,7 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/%{name}/libhbuddall.a %{?_with_localzlib:%{_libdir}/%{name}/libhbzlib.a} %{?_with_localpcre:%{_libdir}/%{name}/libhbpcre.a} +%{?_with_localpng:%{_libdir}/%{name}/libpng.a} %files lib %defattr(755,root,root,755)