From nobody Wed Jul 06 20:00:19 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 8AD931D06D95; Wed, 6 Jul 2022 20:00:19 +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 4LdVl73QHvz3v5D; Wed, 6 Jul 2022 20:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657137619; 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=6poFY7BjlBxNn9e++lNrr2WEeVl8DhpKOkm1jPQtoZw=; b=NEoAdVQhOJq+gbPX3oH9FIrHk+HAFyMz8/ay69lJd5qzo63FaEdwlIfOdfttWopHafBbbx fjC75w8hyis06MlxdAmZgDrlpRnpCDDWw7Aimjy1iDmWuQxmqPjl4KSi+MX6m5H9l13aTg 4Z5fz6Q5h3JZGL/cXfoWsAvkw105oIEN7ShVwAC2wpAie9uX93ajHYRYP0Ig72ZGxl0wDH vkdaPViRqw+3Fh8xP0QXi4X7PVOpRw040aezPm6/1Nitv69gpYADSn2+d6/crInHy0i+A0 cqN1a/N59u8x3yMXyZiFc1nWEqFNEPx0x508wbMAYXr4dGFtlpFejZFxL4wcKQ== 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 4AABD20AD8; Wed, 6 Jul 2022 20:00:19 +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 266K0JdT022592; Wed, 6 Jul 2022 20:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266K0Jtu022586; Wed, 6 Jul 2022 20:00:19 GMT (envelope-from git) Date: Wed, 6 Jul 2022 20:00:19 GMT Message-Id: <202207062000.266K0Jtu022586@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: 0ee16d4291a0 - main - graphics/poppler-glib: remove accidental patch 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: 0ee16d4291a0343b2e5fd6c4561fc7afca89e1db Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657137619; 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=6poFY7BjlBxNn9e++lNrr2WEeVl8DhpKOkm1jPQtoZw=; b=yEw3S535rjnL/z58uqqkL9sOqbTobwQrWKXGzp7nswshzsEKYP1dyRt2Qt8EHd8lrITpEM 7nRcZtx1CMUVk4/2DZNYMx70WzhEE2fg26KoEfV8vvYZmJuXvpct7oXUTg7hfB8wWxwl7C KKomSrpZ+UfGHzUJde3o0Oo+NDh0LekEs6HKFur9cVELn9qkMpIP8pjHUYNbLD0LMGiS7i iZV5AJK+dLoLYsHHuM12KK+dGeMEpYvMO/88S3eQA0I4IdkCgCu6NL6r87uG/rqGAc3grZ Leyh4jf3+S3rVPG2ql0VTrtXrNOPnkDdgYoUKqQdiBOtazV1i7pK4kvuSFAKOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657137619; a=rsa-sha256; cv=none; b=HyRUbLSkunvRHvzDmiD169kGZ8c/8fvX4vTMYhiaQl7PJqCHtrLjtpNb7vwzmgT5zT57dB 1tz6Bip1BsDRoVCKKJvZSsDYmmt2Z6niDqK2iAVpSyCcjbZrUar6B9t/lox6xwqrz/lZbm ehMwM2HLYZkV/SoWuyg8OzxzK3HJCh4tgloGfhNa60v8XS9DH7+wLnkc8JcdXnyeHumnJh /YbZW3O7yrNjI+F3OYMHeEzjUahCaqKNRd8JoR2kfQ2OFj6+tsyK/sQ3yY3BpQpPT0ec1M Qkj5HXHEZZ2WykSzMwQkYGH+NgKU1dGfUKH3LRaxtzIutFsok5hvs67HOD/qng== 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=0ee16d4291a0343b2e5fd6c4561fc7afca89e1db commit 0ee16d4291a0343b2e5fd6c4561fc7afca89e1db Author: Tobias C. Berner AuthorDate: 2022-07-06 19:59:22 +0000 Commit: Tobias C. Berner CommitDate: 2022-07-06 20:00:10 +0000 graphics/poppler-glib: remove accidental patch Pointy hat: tcberner --- .../0001-graphics-poppler-glib-fix-build.patch.v3 | 40 ---------------------- 1 file changed, 40 deletions(-) diff --git a/graphics/poppler/0001-graphics-poppler-glib-fix-build.patch.v3 b/graphics/poppler/0001-graphics-poppler-glib-fix-build.patch.v3 deleted file mode 100644 index 64a97d24efcf..000000000000 --- a/graphics/poppler/0001-graphics-poppler-glib-fix-build.patch.v3 +++ /dev/null @@ -1,40 +0,0 @@ -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 -