From nobody Sun May 07 16:15:07 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QDqJW3NT6z499Nj; Sun, 7 May 2023 16:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QDqJW2T2Sz3tr8; Sun, 7 May 2023 16:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683476107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IqZEXiMe6cOuyymuU3Y94nAcyVINFUZYhe7MrVvvb38=; b=cUI7lx1/aBHoxx5JJr/66fBAF3mAMon1Y+HnShV9ogQv9045EzQiRan8E3aca3wnvJXkce Qrj0gR0yOxXxjGyFrrnP6DMMhNhfQZgWkQF4VHR9aNaR2rU8YZeuGtgKAqJdZqQwjXr05j 02nq7OG5G6bdGgi9l9J/JhazYuSPqL/y5UerTzdZ/53C+W79rhWU+Dxe2opuLqTrP2dQlz 01H+OfHwRtim4UFXPpYy9Ax5QYp0JqqG0UYeEPQ/PLtJPShYcveeZdWS3bw86PyZqr3RxS wWpdI9gbKiCLtSn2HrWXJw6SGKE0PdEcZKF22hDS34nLDQVPC+BlszdZVFWWKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683476107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IqZEXiMe6cOuyymuU3Y94nAcyVINFUZYhe7MrVvvb38=; b=O3s/hwMnXh+OfbBUjNMcwTKft2pHuSSaFr1eK1UiooqU1M3GuZlJkz7fVZsRByNlBA08ha WY5YwtVLlLropiL/5jqYpJUOtkLhlmX/AFF5XUlyAoZS4J0PKKkaHp016efO5r8+aAQiFA qDvUDv6byvhtW9gjVSyn9I85NIUBOt8nAeKd3iDv6saa1qdnVm7Uo7/TtuunuwnFXsFjBl IX5DORMwT6+nMD6MmgNafPSOLRhyApxLfQTAFDEg2pi6cW7YEnhwJxyWALnSb7G3da7Y5+ icl51Lyk3FjvYGscxlvF70wKVCxy/RhD41c+4MUJYHWvgU4PpOrbkmx4rI+wSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683476107; a=rsa-sha256; cv=none; b=kjOLYEcglIf48YAiuFCRarnAyyWcVH1a6sXRWZvR12S2egRRXrah8PZ7VerROhM8abD/GV 1p/toNhyKEpF5hzOYtvLRrZ0PjcThDbm2MHSg9FCWmrcP208KUsnCWnqHi5WgmGJJaCCYn cx8irkSsmYAkFeYsI6ca7Uroed4U+qYB4J/WpZRm1rWGGEeSgcHMowIxuazUwR9ALOsrFG aFFZPRSSp4skUjecogJ6b0cVLcfERM4fOuEPT+vbkK3QeT3JDbZ9yql8usuD9JV2hJgj8R va8PsjPTNn2Vju1M18R3GdEuzlchI63CLKKJXcEd7PFcbHAOPmsdOZ4jJtKndw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QDqJW0t1NzQ3X; Sun, 7 May 2023 16:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 347GF7MY042314; Sun, 7 May 2023 16:15:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347GF7ES042313; Sun, 7 May 2023 16:15:07 GMT (envelope-from git) Date: Sun, 7 May 2023 16:15:07 GMT Message-Id: <202305071615.347GF7ES042313@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 9d319600edee - main - print/miktex: Fix build with log4cxx 1.1.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d319600edeeee1974ba8ff008b31ec4e5ad0db3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d319600edeeee1974ba8ff008b31ec4e5ad0db3 commit 9d319600edeeee1974ba8ff008b31ec4e5ad0db3 Author: Po-Chuan Hsieh AuthorDate: 2023-05-07 16:05:44 +0000 Commit: Po-Chuan Hsieh 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 + #include +-#include ++#include + #include + #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 + #include +-#include ++#include + #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 + + #include +-#include ++#include + #include + + #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 + + #include +-#include ++#include + #include + #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 + + #include +-#include ++#include + #include + + #include +--- Programs/MiKTeX/initexmf/initexmf.cpp.orig 2021-08-06 15:45:04 UTC ++++ Programs/MiKTeX/initexmf/initexmf.cpp +@@ -67,7 +67,7 @@ + + #include + #include +-#include ++#include + #include + #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 + #include +-#include ++#include + #include + #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 + #include +-#include ++#include + + #define UNUSED_ALWAYS(x) +