From owner-svn-ports-all@freebsd.org Sat Aug 8 07:21:30 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 240123A2CC8; Sat, 8 Aug 2020 07:21:30 +0000 (UTC) (envelope-from tcberner@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BNtvG0CSRz4RgC; Sat, 8 Aug 2020 07:21:30 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DF73425281; Sat, 8 Aug 2020 07:21:29 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0787LTtx089314; Sat, 8 Aug 2020 07:21:29 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0787LT6U089313; Sat, 8 Aug 2020 07:21:29 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202008080721.0787LT6U089313@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 8 Aug 2020 07:21:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544366 - head/graphics/katarakt/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/graphics/katarakt/files X-SVN-Commit-Revision: 544366 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Aug 2020 07:21:30 -0000 Author: tcberner Date: Sat Aug 8 07:21:29 2020 New Revision: 544366 URL: https://svnweb.freebsd.org/changeset/ports/544366 Log: graphics/katarakt: prepare for poppler 20.08.0 - the minor version now represents a two digit calendar month, given that 08 and 09 are invalid octals, strip the leading zero out. PR: 248419 Modified: head/graphics/katarakt/files/patch-katarakt.pro Modified: head/graphics/katarakt/files/patch-katarakt.pro ============================================================================== --- head/graphics/katarakt/files/patch-katarakt.pro Sat Aug 8 07:12:14 2020 (r544365) +++ head/graphics/katarakt/files/patch-katarakt.pro Sat Aug 8 07:21:29 2020 (r544366) @@ -1,6 +1,16 @@ ---- katarakt.pro.orig 2019-12-29 14:08:42 UTC +--- katarakt.pro.orig 2017-08-23 19:28:21 UTC +++ katarakt.pro -@@ -57,3 +57,6 @@ web.depends = $$website.target +@@ -18,7 +18,8 @@ unix { + isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config # same as in link_pkgconfig.prf + POPPLER_VERSION = $$system($$PKG_CONFIG --modversion $$POPPLER) + POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1) +- POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2) ++ # With the new version scheme the minor version can have leading zeroes (calendar month) ++ POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2 | sed "s|^0*||g") + POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3) + + DEFINES += POPPLER_VERSION_MAJOR=$$POPPLER_VERSION_MAJOR +@@ -57,3 +58,6 @@ web.depends = $$website.target web.CONFIG = phony QMAKE_EXTRA_TARGETS += documentation website doc web