[packages/log4cxx] - updated to 1.1.0

[qboosh]

commit f4c0607834a726acd4cd65cceea7a410b653b186
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jul 22 17:07:04 2023 +0200

    - updated to 1.1.0

 log4cxx-libesmtp.patch | 76 --------------------------------------------------
 log4cxx.spec           | 11 ++++----
 2 files changed, 5 insertions(+), 82 deletions(-)
---
diff --git a/log4cxx.spec b/log4cxx.spec
index 6b2cc43..a8064a3 100644
--- a/log4cxx.spec
+++ b/log4cxx.spec
@@ -6,13 +6,12 @@
 Summary:	Log4cxx - a port to C++ of the log4j project
 Summary(pl.UTF-8):	Log4cxx - port projektu log4j dla C++
 Name:		log4cxx
-Version:	1.0.0
-Release:	3
+Version:	1.1.0
+Release:	1
 License:	Apache v2.0
 Group:		Libraries
-Source0:	http://www.apache.org/dist/logging/log4cxx/%{version}/apache-%{name}-%{version}.tar.gz
-# Source0-md5:	2255f30cd968e2c1976081824e435bd5
-Patch0:		%{name}-libesmtp.patch
+Source0:	https://downloads.apache.org/logging/log4cxx/%{version}/apache-%{name}-%{version}.tar.gz
+# Source0-md5:	50b76cadf829152371011d2db38351b2
 URL:		http://logging.apache.org/log4cxx/
 %{?with_qt:BuildRequires:	Qt5Core-devel >= 5}
 BuildRequires:	apr-devel >= 1
@@ -84,7 +83,6 @@ Pliki nagłówkowe biblioteki log4cxx Qt.
 
 %prep
 %setup -q -n apache-%{name}-%{version}
-%patch0 -p1
 
 %build
 %cmake -B build \
@@ -131,4 +129,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/liblog4cxx-qt.so
 %{_includedir}/log4cxx-qt
 %{_pkgconfigdir}/liblog4cxx-qt.pc
+%{_libdir}/cmake/log4cxx-qt
 %endif
diff --git a/log4cxx-libesmtp.patch b/log4cxx-libesmtp.patch
deleted file mode 100644
index 8ecded3..0000000
--- a/log4cxx-libesmtp.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- apache-log4cxx-1.0.0/src/main/cpp/smtpappender.cpp.orig	2023-01-01 18:42:12.000000000 +0100
-+++ apache-log4cxx-1.0.0/src/main/cpp/smtpappender.cpp	2023-02-09 20:39:33.462772023 +0100
-@@ -674,23 +674,23 @@ bool SMTPAppender::checkEntryConditions(
- {
- #if LOG4CXX_HAVE_LIBESMTP
- 
--	if ((to.empty() && cc.empty() && bcc.empty()) || from.empty() || smtpHost.empty())
-+	if ((_priv->to.empty() && _priv->cc.empty() && _priv->bcc.empty()) || _priv->from.empty() || _priv->smtpHost.empty())
- 	{
--		errorHandler->error(LOG4CXX_STR("Message not configured."));
-+		_priv->errorHandler->error(LOG4CXX_STR("Message not configured."));
- 		return false;
- 	}
- 
--	if (evaluator == 0)
-+	if (_priv->evaluator == 0)
- 	{
--		errorHandler->error(LOG4CXX_STR("No TriggeringEventEvaluator is set for appender [") +
--			name + LOG4CXX_STR("]."));
-+		_priv->errorHandler->error(LOG4CXX_STR("No TriggeringEventEvaluator is set for appender [") +
-+			_priv->name + LOG4CXX_STR("]."));
- 		return false;
- 	}
- 
- 
--	if (layout == 0)
-+	if (_priv->layout == 0)
- 	{
--		errorHandler->error(LOG4CXX_STR("No layout set for appender named [") + name + LOG4CXX_STR("]."));
-+		_priv->errorHandler->error(LOG4CXX_STR("No layout set for appender named [") + _priv->name + LOG4CXX_STR("]."));
- 		return false;
- 	}
- 
-@@ -749,22 +749,22 @@ void SMTPAppender::sendBuffer(Pool& p)
- 	try
- 	{
- 		LogString sbuf;
--		layout->appendHeader(sbuf, p);
-+		_priv->layout->appendHeader(sbuf, p);
- 
--		int len = cb.length();
-+		int len = _priv->cb.length();
- 
- 		for (int i = 0; i < len; i++)
- 		{
--			LoggingEventPtr event = cb.get();
--			layout->format(sbuf, event, p);
-+			LoggingEventPtr event = _priv->cb.get();
-+			_priv->layout->format(sbuf, event, p);
- 		}
- 
--		layout->appendFooter(sbuf, p);
-+		_priv->layout->appendFooter(sbuf, p);
- 
--		SMTPSession session(smtpHost, smtpPort, smtpUsername, smtpPassword, p);
-+		SMTPSession session(_priv->smtpHost, _priv->smtpPort, _priv->smtpUsername, _priv->smtpPassword, p);
- 
--		SMTPMessage message(session, from, to, cc,
--			bcc, subject, sbuf, p);
-+		SMTPMessage message(session, _priv->from, _priv->to, _priv->cc,
-+			_priv->bcc, _priv->subject, sbuf, p);
- 
- 		session.send(p);
- 
---- apache-log4cxx-1.0.0/src/main/cpp/CMakeLists.txt.orig	2023-01-01 18:42:12.000000000 +0100
-+++ apache-log4cxx-1.0.0/src/main/cpp/CMakeLists.txt	2023-02-09 21:23:28.838494968 +0100
-@@ -212,6 +212,9 @@ endif()
- if(${ENABLE_FMT_LAYOUT})
-     target_link_libraries(log4cxx PUBLIC fmt::fmt)
- endif()
-+if(HAS_LIBESMTP)
-+    target_link_libraries(log4cxx PRIVATE esmtp)
-+endif()
- 
- if(LOG4CXX_ABI_CHECK)
-     message("Getting dependencies for ABI compatability check...")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/log4cxx.git/commitdiff/f4c0607834a726acd4cd65cceea7a410b653b186