From ab27ba47fedc879323a23432dee675b0a931a248 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Wed, 1 Feb 2023 15:53:53 +0100 Subject: [PATCH] log4cxx: update to 1.0.0 - fix a linting issue - fix subpackage --- .../patches/100-bugfix-LOGCXX-284.patch | 17 ---- .../patches/150-bugfix-LOGCXX-365.patch | 19 ----- srcpkgs/log4cxx/patches/170-gcc6-fix.patch | 80 ------------------- .../patches/180-gcc-fix-testsuite.patch | 25 ------ .../log4cxx/patches/missing-includes.patch | 38 --------- srcpkgs/log4cxx/template | 15 ++-- 6 files changed, 8 insertions(+), 186 deletions(-) delete mode 100644 srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch delete mode 100644 srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch delete mode 100644 srcpkgs/log4cxx/patches/170-gcc6-fix.patch delete mode 100644 srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch delete mode 100644 srcpkgs/log4cxx/patches/missing-includes.patch diff --git a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch deleted file mode 100644 index fcff330f36d7..000000000000 --- a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch +++ /dev/null @@ -1,17 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 100-bugfix-LOGCXX-284.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fixes build error on AIX with xlc_r - ---- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700 -+++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700 -@@ -181,7 +181,7 @@ - // output the using STL - // - std::basic_ostringstream buffer; --#if defined(_USEFAC) -+#if defined(_MSC_VER) && _MSC_VER < 1300 - _USEFAC(locale, std::time_put) - .put(buffer, buffer, &date, fmt.c_str(), fmt.c_str() + fmt.length()); - #else diff --git a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch deleted file mode 100644 index 0cf96b67ae4a..000000000000 --- a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: fixes test suite to not expect the year to be between 2000 and 2009. -Origin: upstream, http://svn.apache.org/viewvc?view=rev&rev=954335 -Bug: https://issues.apache.org/jira/browse/LOGCXX-365 -Forwarded: not-needed -Applied-Upstream: commit 954335 -Last-Update: 2014-03-14 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334 -+++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335 -@@ -31,7 +31,7 @@ - #define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)" - #define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}" - #define ABSOLUTE_DATE_AND_TIME_PAT \ -- "[0-9]\\{1,2\\} .* 200[0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}" -+ "[0-9]\\{1,2\\} .* 2[0-9][0-9][0-9] [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}" - #define ABSOLUTE_TIME_PAT "[0-2][0-9]:[0-9][0-9]:[0-9][0-9],[0-9][0-9][0-9]" - #define RELATIVE_TIME_PAT "^[0-9]+" - diff --git a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch deleted file mode 100644 index cfa0c2f5319c..000000000000 --- a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch +++ /dev/null @@ -1,80 +0,0 @@ -Description: Fix FTBFS with GCC6 - GCC6 is more pickier on truncating, so this patch fixes the narrowing conversion errors. -Author: Tobias Frost -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811768 -Forwarded: https://issues.apache.org/jira/browse/LOGCXX-482 -Applied-Upstream: yes, targeted version 0.11.0 -Last-Update: 2016-07-01 (DebCamp16) ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/src/main/cpp/locationinfo.cpp -+++ b/src/main/cpp/locationinfo.cpp -@@ -148,7 +148,7 @@ - if (lineNumber == -1 && fileName == NA && methodName == NA_METHOD) { - os.writeNull(p); - } else { -- char prolog[] = { -+ unsigned char prolog[] = { - 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E, - 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C, - 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69, -@@ -161,7 +161,7 @@ - 0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67, - 0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, - 0x78, 0x70 }; -- os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p); -+ os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, (char *)prolog, sizeof(prolog), p); - char* line = p.itoa(lineNumber); - // - // construct Java-like fullInfo (replace "::" with ".") ---- a/src/main/cpp/loggingevent.cpp -+++ b/src/main/cpp/loggingevent.cpp -@@ -236,7 +236,7 @@ - - - void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) { -- char classDesc[] = { -+ unsigned char classDesc[] = { - 0x72, 0x00, 0x21, - 0x6F, 0x72, 0x67, 0x2E, 0x61, 0x70, 0x61, 0x63, - 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A, -@@ -292,7 +292,7 @@ - 0x3B, 0x78, 0x70 }; - - os.writeProlog("org.apache.log4j.spi.LoggingEvent", -- 8, classDesc, sizeof(classDesc), p); -+ 8, (char *) classDesc, sizeof(classDesc), p); - } - - void LoggingEvent::write(helpers::ObjectOutputStream& os, Pool& p) const { ---- a/src/main/cpp/objectoutputstream.cpp -+++ b/src/main/cpp/objectoutputstream.cpp -@@ -36,8 +36,8 @@ - objectHandle(0x7E0000), - classDescriptions(new ClassDescriptionMap()) - { -- char start[] = { 0xAC, 0xED, 0x00, 0x05 }; -- ByteBuffer buf(start, sizeof(start)); -+ unsigned char start[] = { 0xAC, 0xED, 0x00, 0x05 }; -+ ByteBuffer buf((char*)start, sizeof(start)); - os->write(buf, p); - } - -@@ -81,7 +81,7 @@ - // - // TC_OBJECT and the classDesc for java.util.Hashtable - // -- char prolog[] = { -+ unsigned char prolog[] = { - 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61, - 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61, - 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13, -@@ -90,7 +90,7 @@ - 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49, - 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, - 0x6F, 0x6C, 0x64, 0x78, 0x70 }; -- writeProlog("java.util.Hashtable", 1, prolog, sizeof(prolog), p); -+ writeProlog("java.util.Hashtable", 1, (char *) prolog, sizeof(prolog), p); - // - // loadFactor = 0.75, threshold = 5, blockdata start, buckets.size = 7 - char data[] = { 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, diff --git a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch deleted file mode 100644 index 71b71467a131..000000000000 --- a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Fix narrowing errors also for the testsuite -Author: Tobias Frost -Last-Update: 2016-10-23 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/src/test/cpp/xml/domtestcase.cpp -+++ b/src/test/cpp/xml/domtestcase.cpp -@@ -190,7 +190,7 @@ - DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml")); - LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3"); - #if LOG4CXX_LOGCHAR_IS_UTF8 -- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 }; -+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xC2, (logchar)0xB3, 0 }; - #else - const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 }; - #endif -@@ -209,7 +209,7 @@ - DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml")); - LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4"); - #if LOG4CXX_LOGCHAR_IS_UTF8 -- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 }; -+ const logchar fname[] = { 0x6F, (logchar)0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, (logchar)0xE3, (logchar)0x86, (logchar)0x95, 0 }; - #else - const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 }; - #endif diff --git a/srcpkgs/log4cxx/patches/missing-includes.patch b/srcpkgs/log4cxx/patches/missing-includes.patch deleted file mode 100644 index a63bffd95c57..000000000000 --- a/srcpkgs/log4cxx/patches/missing-includes.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp ---- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200 -+++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200 -@@ -15,7 +15,10 @@ - * limitations under the License. - */ - --#include -+#include -+#include -+#include -+#include - #include - #include - #include -diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp ---- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200 -+++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200 -@@ -21,6 +21,8 @@ - #include - #include - -+#include -+ - using namespace log4cxx; - using namespace log4cxx::helpers; - -diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp ---- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200 -+++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200 -@@ -20,6 +20,8 @@ - #include - #include - -+#include -+ - using namespace log4cxx; - using namespace log4cxx::helpers; diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template index 2f4905a16092..956333fed797 100644 --- a/srcpkgs/log4cxx/template +++ b/srcpkgs/log4cxx/template @@ -1,22 +1,23 @@ # Template file for 'log4cxx' pkgname=log4cxx -version=0.10.0 -revision=4 -build_style=gnu-configure -makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel" -short_desc="A C++ Logging Library based on Log4J" +version=1.0.0 +revision=1 +build_style=cmake +hostmakedepends="pkg-config zip" +makedepends="libxml2-devel apr-devel apr-util-devel gdbm-devel boost-devel" +short_desc="C++ Logging Library based on Log4J" maintainer="Orphaned " license="Apache-2.0" homepage="https://logging.apache.org/log4cxx/" distfiles="https://archive.apache.org/dist/logging/log4cxx/${version}/apache-log4cxx-${version}.tar.gz" -checksum=0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c +checksum=6df9f1f682650de6045309473d5b2fe1f798a03ceb36a74a5b21f5520962d32f log4cxx-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.a + vmove usr/lib/cmake vmove usr/lib/*.so vmove usr/lib/pkgconfig }