Date: Sun, 7 May 2023 16:15:07 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9d319600edee - main - print/miktex: Fix build with log4cxx 1.1.0 Message-ID: <202305071615.347GF7ES042313@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d319600edeeee1974ba8ff008b31ec4e5ad0db3 commit 9d319600edeeee1974ba8ff008b31ec4e5ad0db3 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-05-07 16:05:44 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2023-05-07 16:12:37 +0000 print/miktex: Fix build with log4cxx 1.1.0 - While I'm here, use USES=dos2unix to convert CRLF to LF --- print/miktex/Makefile | 2 +- print/miktex/files/patch-log4cxx | 88 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/print/miktex/Makefile b/print/miktex/Makefile index 23e8a7411eb0..b0a3fa203d8a 100644 --- a/print/miktex/Makefile +++ b/print/miktex/Makefile @@ -45,7 +45,7 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \ liburiparser.so:net/uriparser \ libzzip.so:devel/zziplib -USES= bison cmake:noninja gettext-tools gmake gnome jpeg pkgconfig ssl xorg +USES= bison cmake:noninja dos2unix gettext-tools gmake gnome jpeg pkgconfig ssl xorg USE_GITHUB= yes GH_ACCOUNT= MiKTeX diff --git a/print/miktex/files/patch-log4cxx b/print/miktex/files/patch-log4cxx new file mode 100644 index 000000000000..ca82600dbbd0 --- /dev/null +++ b/print/miktex/files/patch-log4cxx @@ -0,0 +1,88 @@ +--- Libraries/MiKTeX/App/app.cpp.orig 2021-08-06 15:45:04 UTC ++++ Libraries/MiKTeX/App/app.cpp +@@ -35,7 +35,7 @@ + + #include <log4cxx/basicconfigurator.h> + #include <log4cxx/logger.h> +-#include <log4cxx/rollingfileappender.h> ++#include <log4cxx/rolling/rollingfileappender.h> + #include <log4cxx/xml/domconfigurator.h> + #if defined(LOG4CXX_INFO_FMT) + # define MIKTEX_LOG4CXX_12 1 +--- Programs/Editors/TeXworks/miktex/miktex-texworks.cpp.orig 2021-08-06 15:45:04 UTC ++++ Programs/Editors/TeXworks/miktex/miktex-texworks.cpp +@@ -35,7 +35,7 @@ + + #include <log4cxx/logger.h> + #include <log4cxx/xml/domconfigurator.h> +-#include <log4cxx/rollingfileappender.h> ++#include <log4cxx/rolling/rollingfileappender.h> + #if defined(LOG4CXX_INFO_FMT) + # define MIKTEX_LOG4CXX_12 1 + #endif +--- Programs/MiKTeX/Console/Qt/main.cpp.orig 2021-08-06 15:45:04 UTC ++++ Programs/MiKTeX/Console/Qt/main.cpp +@@ -33,7 +33,7 @@ + #include <QTranslator> + + #include <log4cxx/logger.h> +-#include <log4cxx/rollingfileappender.h> ++#include <log4cxx/rolling/rollingfileappender.h> + #include <log4cxx/xml/domconfigurator.h> + + #include "console-version.h" +--- Programs/MiKTeX/PackageManager/mpm/mpm.cpp.orig 2021-08-06 15:45:04 UTC ++++ Programs/MiKTeX/PackageManager/mpm/mpm.cpp +@@ -44,7 +44,7 @@ + #include <fmt/ostream.h> + + #include <log4cxx/logger.h> +-#include <log4cxx/rollingfileappender.h> ++#include <log4cxx/rolling/rollingfileappender.h> + #include <log4cxx/xml/domconfigurator.h> + #if defined(LOG4CXX_INFO_FMT) + # define MIKTEX_LOG4CXX_12 1 +--- Programs/MiKTeX/Yap/MFC/StdAfx.h.orig 2021-08-06 15:45:04 UTC ++++ Programs/MiKTeX/Yap/MFC/StdAfx.h +@@ -62,7 +62,7 @@ + #include <string> + + #include <log4cxx/logger.h> +-#include <log4cxx/rollingfileappender.h> ++#include <log4cxx/rolling/rollingfileappender.h> + #include <log4cxx/xml/domconfigurator.h> + + #include <fmt/format.h> +--- Programs/MiKTeX/initexmf/initexmf.cpp.orig 2021-08-06 15:45:04 UTC ++++ Programs/MiKTeX/initexmf/initexmf.cpp +@@ -67,7 +67,7 @@ + + #include <log4cxx/basicconfigurator.h> + #include <log4cxx/logger.h> +-#include <log4cxx/rollingfileappender.h> ++#include <log4cxx/rolling/rollingfileappender.h> + #include <log4cxx/xml/domconfigurator.h> + #if defined(LOG4CXX_INFO_FMT) + # define MIKTEX_LOG4CXX_12 1 +--- Programs/MiKTeX/miktex/miktex.cpp.orig 2021-08-06 15:45:04 UTC ++++ Programs/MiKTeX/miktex/miktex.cpp +@@ -34,7 +34,7 @@ + + #include <log4cxx/basicconfigurator.h> + #include <log4cxx/logger.h> +-#include <log4cxx/rollingfileappender.h> ++#include <log4cxx/rolling/rollingfileappender.h> + #include <log4cxx/xml/domconfigurator.h> + #if defined(LOG4CXX_INFO_FMT) + # define MIKTEX_LOG4CXX_12 1 +--- Programs/MiKTeX/mkfntmap/internal.h.orig 2021-08-06 15:45:04 UTC ++++ Programs/MiKTeX/mkfntmap/internal.h +@@ -57,7 +57,7 @@ + + #include <log4cxx/logger.h> + #include <log4cxx/xml/domconfigurator.h> +-#include <log4cxx/rollingfileappender.h> ++#include <log4cxx/rolling/rollingfileappender.h> + + #define UNUSED_ALWAYS(x) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305071615.347GF7ES042313>