From nobody Fri Dec 30 09:08:35 2022 X-Original-To: dev-commits-ports-main@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 4NjzvS12BNz2kcQq; Fri, 30 Dec 2022 09:08:36 +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 4NjzvR4BCmz3sfS; Fri, 30 Dec 2022 09:08:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391315; 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=qCx6wKwiZTd0vRZNR2eZ7wYsNkTr90l8kd4hSSOeheM=; b=GkOh0AjzowahL0GXozGe6/FyGU88j5o8Wf3Mrdnm1sJAZldCPWQHaW+xtVZjSvrgk2vASS lX0vNZz+Q3YZldU3mlKmmvxNs8c7QTM4tsSoyyS4qHPgEO8nXRjYeoZ+9O/gZVFMd8EkYg 1FdNfe8hvlCMYRCGBH74271iBawn7aoixRyITDGaAalMAzde1poJll6Aqwm+ihkufR0bKY d/yvrI10XmOyKREDgxcySCa4ofNHiLmlAwdypbiXl9uNAoCS3kLQn05dW79MZNpGTZh5WJ mbR+qDKCLgGtiM8o13MwVjNbuCWXki/nIKAmJyZGCnxF2vsS2vuCLMqv+qSJ9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391315; 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=qCx6wKwiZTd0vRZNR2eZ7wYsNkTr90l8kd4hSSOeheM=; b=AVtOLFukj1xhEOTaPlvC+KdUTr4LMvNCNgHlHe6F4gRXuycGDue7Zy9Z8SilqxsRhCQCqE A29IySK0AFbnlR7hGJUmFJgkGW5FQh9sgG3U7KraXYGMF6XmWbujBfroVY7VJ381tKBwmv uYCbMN6OzofDZcHSuXQ8vKT7WL9AYwgn6gQ6PLU1nbsGMYvU7w0hbQDIZJ048yl5Hz6pee R7sppQICIy+FunhPQUXKS9SnMNhttlggipgcur/dwI39UM62EgVvuDBV+4z/KHMC817duB 5otkvpu527zI1QegAqHIDxxcIqzkkPqRsjzzbA/c+2W0N/wcu0WWycsW3agEBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672391315; a=rsa-sha256; cv=none; b=VVG+06QugWNxyzyotEz30lLIlaKdbYLd3imnO1B2Py4efFocQGrbmalyRHlHNtjPO57kqs LUlh4yZMKivrdW5yrPDg4bxl2mpEVbKiFMPqt0lC/4/Sk3Ost+LLjkBHpCMw0iO01jQ9OY Ugj9vS76rhomtcja1j/m1IXemm/rNOSQiq+U53MGsqluawBNahmvOupYnacsOier39Hj/7 2tSjEON/ioT7sFDPyW+uyFjzR/ZDjmv7+MOJQsehFu+bx/75s40rnNp+I/h6jLagg83Z+w sIQn9jUzGhhMCQJFgnItI2QSOQAacwWXjzI9bRQd/eKit1lUPm6LgD9nll+/yw== 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 4NjzvR3J9yz132h; Fri, 30 Dec 2022 09:08:35 +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 2BU98Ziw000134; Fri, 30 Dec 2022 09:08:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BU98ZUc000133; Fri, 30 Dec 2022 09:08:35 GMT (envelope-from git) Date: Fri, 30 Dec 2022 09:08:35 GMT Message-Id: <202212300908.2BU98ZUc000133@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: eda03052ddb2 - main - graphics/podofo: Add UNISTRING option to avoid potential dependency List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: eda03052ddb2064e89964eef6e79ee7d22c73fc5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=eda03052ddb2064e89964eef6e79ee7d22c73fc5 commit eda03052ddb2064e89964eef6e79ee7d22c73fc5 Author: Po-Chuan Hsieh AuthorDate: 2022-12-30 08:40:05 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-12-30 09:04:10 +0000 graphics/podofo: Add UNISTRING option to avoid potential dependency - Bump PORTREVISION for dependency and package change --- graphics/podofo/Makefile | 8 ++++++-- graphics/podofo/files/patch-CMakeLists.txt | 19 +++++++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile index cebf523124d5..a3ad7002f64e 100644 --- a/graphics/podofo/Makefile +++ b/graphics/podofo/Makefile @@ -1,5 +1,6 @@ PORTNAME= podofo PORTVERSION= 0.9.8 +PORTREVISION= 1 CATEGORIES= graphics print MASTER_SITES= SF @@ -26,9 +27,10 @@ CPE_VENDOR= podofo_project DOS2UNIX_FILES= cmake/modules/FindFREETYPE.cmake -OPTIONS_DEFINE= IMPOSE JPEG PNG TIFF -OPTIONS_DEFAULT=JPEG PNG TIFF +OPTIONS_DEFINE= IMPOSE JPEG PNG TIFF UNISTRING +OPTIONS_DEFAULT=JPEG PNG TIFF UNISTRING IMPOSE_DESC= Build impose tool (Lua required) +UNISTRING_DESC= Use libunistring for conversion IMPOSE_CMAKE_BOOL= WANT_LUA IMPOSE_CXXFLAGS= -I${LUA_INCDIR} @@ -40,5 +42,7 @@ PNG_CMAKE_BOOL= WANT_PNG PNG_LIB_DEPENDS= libpng.so:graphics/png TIFF_CMAKE_BOOL= WANT_TIFF TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff +UNISTRING_CMAKE_BOOL= WANT_UNISTRING +UNISTRING_LIB_DEPENDS= libunistring.so:devel/libunistring .include diff --git a/graphics/podofo/files/patch-CMakeLists.txt b/graphics/podofo/files/patch-CMakeLists.txt index f809260c5145..4e57653dc3ff 100644 --- a/graphics/podofo/files/patch-CMakeLists.txt +++ b/graphics/podofo/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2021-01-05 16:56:54 UTC +--- CMakeLists.txt.orig 2022-05-03 12:18:23 UTC +++ CMakeLists.txt @@ -348,6 +348,7 @@ ELSE(LIBIDN_FOUND) MESSAGE("Libidn not found. AES-256 Encryption support will be disabled") @@ -28,15 +28,22 @@ FIND_PACKAGE(PNG) IF(PNG_FOUND) -@@ -378,6 +383,7 @@ ELSE(PNG_FOUND) +@@ -378,7 +383,9 @@ ELSE(PNG_FOUND) MESSAGE("LibPng not found. PNG support will be disabled") SET(PNG_LIBRARIES "") ENDIF(PNG_FOUND) +ENDIF(WANT_PNG) ++IF(WANT_UNISTRING) FIND_PACKAGE(UNISTRING) -@@ -393,6 +399,7 @@ ENDIF(UNISTRING_FOUND) + IF(UNISTRING_FOUND) +@@ -389,10 +396,12 @@ ELSE(UNISTRING_FOUND) + MESSAGE("LibUnistring not found. Unistring support will be disabled") + SET(UNISTRING_LIBRARY "") + ENDIF(UNISTRING_FOUND) ++ENDIF(WANT_UNISTRING) + IF(NOT PODOFO_BUILD_LIB_ONLY) @@ -44,7 +51,7 @@ FIND_PACKAGE(CppUnit) IF(CppUnit_FOUND) -@@ -402,6 +409,7 @@ IF(CppUnit_FOUND) +@@ -402,6 +411,7 @@ IF(CppUnit_FOUND) ELSE(CppUnit_FOUND) MESSAGE("Cppunit not found. No unit tests will be built.") ENDIF(CppUnit_FOUND) @@ -52,7 +59,7 @@ ENDIF(NOT PODOFO_BUILD_LIB_ONLY) -@@ -442,6 +450,7 @@ ELSE(WANT_FONTCONFIG) +@@ -442,6 +452,7 @@ ELSE(WANT_FONTCONFIG) ENDIF(WANT_FONTCONFIG) IF(NOT PODOFO_BUILD_LIB_ONLY) @@ -60,7 +67,7 @@ FIND_PACKAGE(LUA) IF(LUA_FOUND) # If we have lua, we can build podofoimpose. -@@ -453,6 +462,7 @@ IF(LUA_FOUND) +@@ -453,6 +464,7 @@ IF(LUA_FOUND) ELSE(LUA_FOUND) MESSAGE("Lua not found - PoDoFoImpose and PoDoFoColor will be built without Lua support") ENDIF(LUA_FOUND)