From 8d995f8f2bf1ee91063675140b31485fef6d3dc0 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 2 Oct 2021 21:15:13 +0200 Subject: [PATCH] libraries/log4cpp: Updated for version 1.1.3. Signed-off-by: Matteo Bernardini Signed-off-by: Willy Sudiarto Raharjo --- libraries/log4cpp/gcc43.patch | 26 -------------------------- libraries/log4cpp/log4cpp.SlackBuild | 9 +++------ libraries/log4cpp/log4cpp.info | 6 +++--- 3 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 libraries/log4cpp/gcc43.patch diff --git a/libraries/log4cpp/gcc43.patch b/libraries/log4cpp/gcc43.patch deleted file mode 100644 index a60f986e9c..0000000000 --- a/libraries/log4cpp/gcc43.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: log4cpp-1.0/src/BasicLayout.cpp -=================================================================== ---- log4cpp-1.0.orig/src/BasicLayout.cpp 2008-03-14 16:06:57.000000000 -0400 -+++ log4cpp-1.0/src/BasicLayout.cpp 2008-03-14 16:07:11.000000000 -0400 -@@ -15,6 +15,8 @@ - #include - #endif - -+#include -+ - namespace log4cpp { - - BasicLayout::BasicLayout() { -Index: log4cpp-1.0/src/PatternLayout.cpp -=================================================================== ---- log4cpp-1.0.orig/src/PatternLayout.cpp 2008-03-14 16:07:33.000000000 -0400 -+++ log4cpp-1.0/src/PatternLayout.cpp 2008-03-14 16:07:49.000000000 -0400 -@@ -370,7 +370,7 @@ - literal = ""; - } - if ((minWidth != 0) || (maxWidth != 0)) { -- component = new FormatModifierComponent(component, std::abs(minWidth), maxWidth, minWidth < 0); -+ component = new FormatModifierComponent(component, std::abs((float)minWidth), maxWidth, minWidth < 0); - minWidth = maxWidth = 0; - } - _components.push_back(component); diff --git a/libraries/log4cpp/log4cpp.SlackBuild b/libraries/log4cpp/log4cpp.SlackBuild index 6fb10c58b7..a442a1d865 100644 --- a/libraries/log4cpp/log4cpp.SlackBuild +++ b/libraries/log4cpp/log4cpp.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=log4cpp -VERSION=${VERSION:-1.0} +VERSION=${VERSION:-1.1.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,9 +73,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf $PRGNAM tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +cd $PRGNAM chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -83,9 +83,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# apply patches -patch -Np1 -i $CWD/gcc43.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/log4cpp/log4cpp.info b/libraries/log4cpp/log4cpp.info index c7ede5ab14..036a007ba8 100644 --- a/libraries/log4cpp/log4cpp.info +++ b/libraries/log4cpp/log4cpp.info @@ -1,8 +1,8 @@ PRGNAM="log4cpp" -VERSION="1.0" +VERSION="1.1.3" HOMEPAGE="http://log4cpp.sourceforge.net/" -DOWNLOAD="https://downloads.sourceforge.net/log4cpp/log4cpp-1.0.tar.gz" -MD5SUM="1face50ead0790d1297dfb04bacf273c" +DOWNLOAD="https://downloads.sourceforge.net/log4cpp/log4cpp-1.1.3.tar.gz" +MD5SUM="b9e2cee932da987212f2c74b767b4d8b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""