From nobody Wed Jul 6 19:54:52 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 299491D05374; Wed, 6 Jul 2022 19:54:53 +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 4LdVcs0dM0z3s2t; Wed, 6 Jul 2022 19:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657137293; 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=dLpea2UUJamhIgsiqR4F7PTaUaqXSHJyhFz7pmPTg8Y=; b=RxepXsxnGOPJT+kod3YmPFSg6FDDkgHhqe+Yps8lIRkKI63EnyYoiiMFAlRzmWULBkEnSU P61QKN6CiPy8W+WS2bBC0p8EZo6Y0kQ4E+9WmQL0oCxyJG5GdqiznlXALt5SuCXWh/+tcf uh43rPa+LXLAl8gYF372k4OtbajJD1MOcZZUvzAY2BH1skICUdAf4LJz2ckI5xhc3njRYq fwevrKpaGxRigbbcCB0gwcO+7HtP6Wx2pHELCvL6YYRIhIYPLlRjK6iFqgL+zzR3l+NMBA 4X/UblNGwIzxmZbbVdaybMVptRAFF9u1N7ysrV6NaY2sJCNi+Cw4HxBgT5i1eg== 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 DB04420E36; Wed, 6 Jul 2022 19:54:52 +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 266Jsqpr013716; Wed, 6 Jul 2022 19:54:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266JsqcK013715; Wed, 6 Jul 2022 19:54:52 GMT (envelope-from git) Date: Wed, 6 Jul 2022 19:54:52 GMT Message-Id: <202207061954.266JsqcK013715@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: a9a2f55a6b66 - main - graphics/poppler: fix poppler-glib 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9a2f55a6b66aa2fb87c406e072eea8fe00705bd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657137293; 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=dLpea2UUJamhIgsiqR4F7PTaUaqXSHJyhFz7pmPTg8Y=; b=PvZh5FerEW0E4OctLR844BFNNlLGbtL5L2Ghs2kHd3rEfYH8I5+SDiuQzaGug6OmjUS04L b9/Rou+qg8xnn/sb6TBmNPl87i+E/o0xmuZqFO7geMbW5GTLCZIaM6GOekGrG5nHw3XoEW ytpNCSPihtIKQnOaWehci4tjgnuaqK0hKsju3P6SX24kVDlhpp5RTIuMTp6j4VZFRsUTdJ ZyC3L1e/cqddGoN3/7Ry/4NnSF0UbVX4YzGf/7uc3j2s38EnOG3e9fuZw2YrX2LLwrVmlg 6yt/bMzycVPjvhrkRc7sQ/CVn/tH2Csuarmlot7eIKetgJfgEKwyqqTFFdq6pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657137293; a=rsa-sha256; cv=none; b=gTp915cpwsVj9bKW8rAOM+SLhzvsqp0Kq6KaA3ooFxN5tc/uFQ1KMcw6WthxGchaBNjmeY HB3WziO/2J6R7VxdhlcgVnxg6l0+4KbgifRcywe/WZe/utDCJZ3QqKJz+TimG98h4kXC6q bYfvWOphbtIFW2xt30KEQqR3J1uqsgOJdt2KIlYW1zuSFrBpbOGJMXpLxw/5OTXz5+Evbo bnThW1D8z84MyffUj7TEjYkx5TcBMWcmS27hXN4nKf9vkEVMR6OQp9UGq1/QeKZyMoa0P1 NKOaGx3BFHxd5lIDlFmRZLgR2ubDmUEyS9vvfZnWLSUrjF/HJkMSC29fC0tf+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=a9a2f55a6b66aa2fb87c406e072eea8fe00705bd commit a9a2f55a6b66aa2fb87c406e072eea8fe00705bd Author: Tobias C. Berner AuthorDate: 2022-07-06 19:53:26 +0000 Commit: Tobias C. Berner CommitDate: 2022-07-06 19:54:46 +0000 graphics/poppler: fix poppler-glib - last minute typo Reported by: Barbara --- .../0001-graphics-poppler-glib-fix-build.patch.v3 | 40 ++++++++++++++++++++++ graphics/poppler/Makefile | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/graphics/poppler/0001-graphics-poppler-glib-fix-build.patch.v3 b/graphics/poppler/0001-graphics-poppler-glib-fix-build.patch.v3 new file mode 100644 index 000000000000..64a97d24efcf --- /dev/null +++ b/graphics/poppler/0001-graphics-poppler-glib-fix-build.patch.v3 @@ -0,0 +1,40 @@ +From 582c9315bf9a2c38e69413d6d632384a02016550 Mon Sep 17 00:00:00 2001 +From: "Tobias C. Berner" +Date: Wed, 6 Jul 2022 19:53:29 +0200 +Subject: [PATCH] graphics/poppler-glib: fix build + +--- + graphics/poppler/Makefile | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile +index 7aa604f204eb..7ddf93fda852 100644 +--- a/graphics/poppler/Makefile ++++ b/graphics/poppler/Makefile +@@ -18,10 +18,11 @@ LIB_DEPENDS= libnspr4.so:devel/nspr \ + libfreetype.so:print/freetype2 \ + libnss3.so:security/nss \ + libfontconfig.so:x11-fonts/fontconfig +-BUILD_DEPENDS= ${LOCALBASE}/include/boost/container/small_vector.hpp:devel/boost-libs ++BUILD_DEPENDS= ${LOCALBASE}/include/boost/container/small_vector.hpp:devel/boost-libs \ ++ gsed:textproc/gsed + RUN_DEPENDS= poppler-data>0:graphics/poppler-data + +-USES= cmake:insource compiler:c++17-lang cpe gnome jpeg libtool \ ++USES= cmake:insource compiler:c++17-lang cpe gnome gperf jpeg libtool \ + localbase pathfix pkgconfig tar:xz + CPE_VENDOR= freedesktop + USE_GNOME= cairo libxml2 +@@ -44,6 +45,9 @@ CMAKE_ARGS+= -DCMAKE_IGNORE_PATH:PATH=${PREFIX}/lib/openjpeg-1.5 + _POPPLER_SLAVES= library glib qt5 utils + _SLAVE_PORT?= library + ++BINARY_ALIAS= gperf=${GPERF} \ ++ sed=${LOCALBASE}/bin/gsed ++ + # Activate the wanted module, and deactivate the others. + CMAKE_ON+= ENABLE_${_SLAVE_PORT:tu} + CMAKE_OFF+= ${_POPPLER_SLAVES:N${_SLAVE_PORT}:tu:S/^/ENABLE_/} +-- +2.37.0 + diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 7ddf93fda852..46f6226234cb 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -76,7 +76,7 @@ CMAKE_ARGS+= -DENABLE_LIBOPENJPEG:STRING="none" \ . if ${_SLAVE_PORT} == glib USES+= python:build USE_GNOME+= glib20 introspection:Build -BINARY_ALIAS= python3=${PYTHON_CMD} +BINARY_ALIAS+= python3=${PYTHON_CMD} . elif ${_SLAVE_PORT} == qt5 USES+= qt:5 USE_QT= core gui widgets xml \