[packages/strigi] - added log4cxx patch (fixes build with log4cxx 1.0.0); release 16

qboosh qboosh at pld-linux.org
Wed Feb 8 21:38:45 CET 2023


commit 9357407846c2d1abd2a333bdd8c296e09267fa88
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Feb 8 21:40:10 2023 +0100

    - added log4cxx patch (fixes build with log4cxx 1.0.0); release 16

 strigi-log4cxx.patch | 35 +++++++++++++++++++++++++++++++++++
 strigi.spec          |  4 +++-
 2 files changed, 38 insertions(+), 1 deletion(-)
---
diff --git a/strigi.spec b/strigi.spec
index 3cc48e5..d435e2a 100644
--- a/strigi.spec
+++ b/strigi.spec
@@ -8,7 +8,7 @@ Summary:	Strigi desktop search
 Summary(pl.UTF-8):	System wyszukiwania Strigi
 Name:		strigi
 Version:	0.7.8
-Release:	15
+Release:	16
 License:	LGPL v2+
 Group:		X11/Applications
 Source0:	http://www.vandenoever.info/software/strigi/%{name}-%{version}.tar.bz2
@@ -21,6 +21,7 @@ Patch4:		gcc8.patch
 Patch5:		exiv2.patch
 Patch6:		%{name}-gccversion.patch
 Patch7:		%{name}-includes.patch
+Patch8:		%{name}-log4cxx.patch
 URL:		http://strigi.sourceforge.net/
 BuildRequires:	QtDBus-devel >= %{qtver}
 BuildRequires:	QtGui-devel >= %{qtver}
@@ -104,6 +105,7 @@ Pliki nagłówkowe dla strigi.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 install -d build
diff --git a/strigi-log4cxx.patch b/strigi-log4cxx.patch
new file mode 100644
index 0000000..32d6364
--- /dev/null
+++ b/strigi-log4cxx.patch
@@ -0,0 +1,35 @@
+--- strigi-0.7.8/strigidaemon/bin/daemon/strigilogging.h.orig	2013-01-25 18:49:35.000000000 +0100
++++ strigi-0.7.8/strigidaemon/bin/daemon/strigilogging.h	2023-02-08 21:09:30.215047101 +0100
+@@ -38,27 +38,27 @@
+ 
+ #define STRIGI_LOG_DEBUG(loggerName, message) { \
+     log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(loggerName); \
+-    LOG4CXX_DEBUG(logger, message) \
++    LOG4CXX_DEBUG(logger, message); \
+ }
+ 
+ #define STRIGI_LOG_INFO(loggerName, message) { \
+     log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(loggerName); \
+-    LOG4CXX_INFO(logger, message) \
++    LOG4CXX_INFO(logger, message); \
+ }
+ 
+ #define STRIGI_LOG_WARNING(loggerName, message) { \
+     log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(loggerName); \
+-    LOG4CXX_WARN(logger, message) \
++    LOG4CXX_WARN(logger, message); \
+ }
+ 
+ #define STRIGI_LOG_ERROR(loggerName, message) { \
+     log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(loggerName); \
+-    LOG4CXX_ERROR(logger, message) \
++    LOG4CXX_ERROR(logger, message); \
+ }
+ 
+ #define STRIGI_LOG_FATAL(loggerName, message) { \
+     log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(loggerName); \
+-    LOG4CXX_FATAL(logger, message) \
++    LOG4CXX_FATAL(logger, message); \
+ }
+ 
+ #else
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/strigi.git/commitdiff/9357407846c2d1abd2a333bdd8c296e09267fa88



More information about the pld-cvs-commit mailing list