package/log4cxx: bump to version 0.12.0

- Drop patch (already in version)
- Switch to cmake-package

https://www.mail-archive.com/announce@apache.org/msg06525.html

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

package/log4cxx/0001-fix-build-without-wchar.patch

@@ -1,55 +0,0 @@
-From 1fa70eaf24d75e84625f22779ec347fd29bf1ae6 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Thu, 24 Sep 2020 08:47:37 +0200
-Subject: [PATCH] fix build without wchar
-
-Disable wencode without wchar or the build will fail on:
-
-odbcappender.cpp: In static member function 'static void log4cxx::db::ODBCAppender::encode(wchar_t**, const LogString&, log4cxx::helpers::Pool&)':
-odbcappender.cpp:362:22: error: 'wencode' is not a member of 'log4cxx::helpers::Transcoder'
-  *dest = Transcoder::wencode(src, p);
-                      ^~~~~~~
-
-Fixes:
- - http://autobuild.buildroot.org/results/bab5329fdeb894471bfd5192ce04d3fbd2f9be5c
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://github.com/apache/logging-log4cxx/commit/f171f818c798d48631d5b45851e4593953f31d9c]
----
- src/main/cpp/odbcappender.cpp              | 2 ++
- src/main/include/log4cxx/db/odbcappender.h | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/src/main/cpp/odbcappender.cpp b/src/main/cpp/odbcappender.cpp
-index 6bfa519e..218df132 100644
---- a/src/main/cpp/odbcappender.cpp
-+++ b/src/main/cpp/odbcappender.cpp
-@@ -357,10 +357,12 @@ void ODBCAppender::setSql(const LogString& s)
- 	}
- }
- 
-+#if LOG4CXX_WCHAR_T_API || LOG4CXX_LOGCHAR_IS_WCHAR_T || defined(WIN32) || defined(_WIN32)
- void ODBCAppender::encode(wchar_t** dest, const LogString& src, Pool& p)
- {
- 	*dest = Transcoder::wencode(src, p);
- }
-+#endif
- 
- void ODBCAppender::encode(unsigned short** dest,
- 	const LogString& src, Pool& p)
-diff --git a/src/main/include/log4cxx/db/odbcappender.h b/src/main/include/log4cxx/db/odbcappender.h
-index a26bc35b..fdc144ff 100644
---- a/src/main/include/log4cxx/db/odbcappender.h
-+++ b/src/main/include/log4cxx/db/odbcappender.h
-@@ -300,8 +300,10 @@ class LOG4CXX_EXPORT ODBCAppender : public AppenderSkeleton
- 	private:
- 		ODBCAppender(const ODBCAppender&);
- 		ODBCAppender& operator=(const ODBCAppender&);
-+#if LOG4CXX_WCHAR_T_API || LOG4CXX_LOGCHAR_IS_WCHAR_T || defined(WIN32) || defined(_WIN32)
- 		static void encode(wchar_t** dest, const LogString& src,
- 			log4cxx::helpers::Pool& p);
-+#endif
- 		static void encode(unsigned short** dest, const LogString& src,
- 			log4cxx::helpers::Pool& p);
- }; // class ODBCAppender

package/log4cxx/log4cxx.hash

@@ -1,4 +1,4 @@
-# From https://www.apache.org/dist/logging/log4cxx/0.11.0/apache-log4cxx-0.11.0.tar.gz.sha512
-sha512  f8aa37c9c094e7a4d6ca92dff13c032f69f1e078c51ea55e284fcb931c13256b08950af3ea6eaf7a12282240f6073e9acab19bfe217f88dbd62a5d2360f3fbdd  apache-log4cxx-0.11.0.tar.gz
+# From https://www.apache.org/dist/logging/log4cxx/0.12.0/apache-log4cxx-0.12.0.tar.gz.sha512
+sha512  00fe571f9c511bf93b17cac8269ce00f7e817e8d723acf62bddff1bbe0e7facd0ab2fd75c01a93870f7e5c66718b2b73fc22c5f193bfd204e34d052b1123e60d  apache-log4cxx-0.12.0.tar.gz
 # Locally computed
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE

package/log4cxx/log4cxx.mk

@@ -4,29 +4,21 @@
 #
 ################################################################################
 
-LOG4CXX_VERSION = 0.11.0
+LOG4CXX_VERSION = 0.12.0
 LOG4CXX_SITE = http://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION)
 LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz
 LOG4CXX_INSTALL_STAGING = YES
 LOG4CXX_LICENSE = Apache-2.0
 LOG4CXX_LICENSE_FILES = LICENSE
-# error: required file './compile' not found
-LOG4CXX_AUTORECONF = YES
 
 LOG4CXX_CONF_OPTS = \
-	--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \
-	--with-apr-util=$(STAGING_DIR)/usr/bin/apu-1-config \
-	--disable-dot \
-	--disable-doxygen \
-	--disable-html-docs
+	-DAPR_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apr-1-config \
+	-DAPR_UTIL_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apu-1-config
 
 LOG4CXX_DEPENDENCIES = apr apr-util
 
 ifeq ($(BR2_PACKAGE_LIBESMTP),y)
 LOG4CXX_DEPENDENCIES += libesmtp
-LOG4CXX_CONF_OPTS += --with-SMTP=libesmtp
-else
-LOG4CXX_CONF_OPTS += --without-SMTP
 endif
 
-$(eval $(autotools-package))
+$(eval $(cmake-package))