Revision: 144134 https://trac.macports.org/changeset/144134 Author: devans@macports.org Date: 2016-01-02 15:47:18 -0800 (Sat, 02 Jan 2016) Log Message: ----------- py-poppler: merge patch from gentoo launchpad repo to fix build with poppler 0.39 (#50192). Modified Paths: -------------- trunk/dports/python/py-poppler/Portfile trunk/dports/python/py-poppler/files/patch-poppler.defs.diff Modified: trunk/dports/python/py-poppler/Portfile =================================================================== --- trunk/dports/python/py-poppler/Portfile 2016-01-02 23:33:23 UTC (rev 144133) +++ trunk/dports/python/py-poppler/Portfile 2016-01-02 23:47:18 UTC (rev 144134) @@ -7,7 +7,7 @@ name py-poppler set rname pypoppler version 0.12.1 -revision 3 +revision 4 platforms darwin license GPL-2 @@ -24,6 +24,10 @@ master_sites ${homepage}/trunk/development/+download/ distname ${rname}-${version} +# merged patch from gentoo launchpad repo to fix build with poppler 0.39 +# https://trac.macports.org/ticket/50192 +# https://bugs.launchpad.net/poppler-python/+bug/1528489 + patchfiles patch-poppler.defs.diff \ patch-poppler.override.diff Modified: trunk/dports/python/py-poppler/files/patch-poppler.defs.diff =================================================================== --- trunk/dports/python/py-poppler/files/patch-poppler.defs.diff 2016-01-02 23:33:23 UTC (rev 144133) +++ trunk/dports/python/py-poppler/files/patch-poppler.defs.diff 2016-01-02 23:47:18 UTC (rev 144134) @@ -1,6 +1,25 @@ ---- poppler.defs.orig 2013-08-12 21:31:22.000000000 -0700 -+++ poppler.defs 2013-08-13 00:38:46.000000000 -0700 -@@ -1646,57 +1646,6 @@ +--- poppler.defs.orig 2016-01-02 15:32:53.000000000 -0800 ++++ poppler.defs 2016-01-02 15:33:07.000000000 -0800 +@@ -578,18 +578,6 @@ + ) + ) + +-(define-enum Orientation +- (in-module "Poppler") +- (c-name "PopplerOrientation") +- (gtype-id "POPPLER_TYPE_ORIENTATION") +- (values +- '("portrait" "POPPLER_ORIENTATION_PORTRAIT") +- '("landscape" "POPPLER_ORIENTATION_LANDSCAPE") +- '("upsidedown" "POPPLER_ORIENTATION_UPSIDEDOWN") +- '("seascape" "POPPLER_ORIENTATION_SEASCAPE") +- ) +-) +- + (define-enum PageTransitionType + (in-module "Poppler") + (c-name "PopplerPageTransitionType") +@@ -1646,57 +1634,6 @@ (return-type "GType") ) @@ -58,7 +77,7 @@ (define-method render (of-object "PopplerPage") -@@ -1794,7 +1743,7 @@ +@@ -1794,7 +1731,7 @@ (define-method get_text (of-object "PopplerPage")