svn commit: r544366 - head/graphics/katarakt/files

[Tobias C. Berner]

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