Hi
aja@ wants ze new poppler. Here it is, in case anyone wants to test it
(I'm still waiting for my bulk build to finish before I can start
testing).
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.105
diff -u -p -r1.105 Makefile
--- Makefile 1 May 2016 12:33:24 -0000 1.105
+++ Makefile 26 May 2016 17:41:14 -0000
@@ -6,7 +6,7 @@ COMMENT-qt4= qt4 interface to PDF render
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.43.0
+V= 0.44.0
DISTNAME= poppler-$V
CATEGORIES= print
PKGNAME-main= poppler-$V
@@ -16,7 +16,7 @@ PKGNAME-qt4= poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 36.0 # 60.0
+SHARED_LIBS += poppler 37.0 # 61.0
SHARED_LIBS += poppler-glib 15.0 # 15.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 18.0 # 13.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.53
diff -u -p -r1.53 distinfo
--- distinfo 1 May 2016 12:33:24 -0000 1.53
+++ distinfo 26 May 2016 17:41:14 -0000
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.43.0.tar.xz) = xyDiaibuELfryeJW0u563NtTbPhfnxxHd6OPf4H7JFY=
+SHA256 (poppler-0.44.0.tar.xz) = W0Z+0mpV4YJNpr2G9fVisbRVggacA4mMkfAa1cb6Dqs=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.43.0.tar.xz) = 1671368
+SIZE (poppler-0.44.0.tar.xz) = 1671900
Index: patches/patch-poppler_Decrypt_cc
===================================================================
RCS file: patches/patch-poppler_Decrypt_cc
diff -N patches/patch-poppler_Decrypt_cc
--- patches/patch-poppler_Decrypt_cc 27 Mar 2016 20:04:25 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,88 +0,0 @@
-$OpenBSD: patch-poppler_Decrypt_cc,v 1.2 2016/03/27 20:04:25 sthen Exp $
---- poppler/Decrypt.cc.orig Mon Mar 14 13:18:16 2016
-+++ poppler/Decrypt.cc Sun Mar 27 14:03:21 2016
-@@ -1444,22 +1444,22 @@ static void sha256(Guchar *msg, int msgLen, Guchar *ha
- //------------------------------------------------------------------------
- // SHA 384 and SHA 512 use the same sequence of eighty constant 64 bit words.
- static const uint64_t K[80] = {
-- 0x428a2f98d728ae22, 0x7137449123ef65cd, 0xb5c0fbcfec4d3b2f,
0xe9b5dba58189dbbc, 0x3956c25bf348b538,
-- 0x59f111f1b605d019, 0x923f82a4af194f9b, 0xab1c5ed5da6d8118,
0xd807aa98a3030242, 0x12835b0145706fbe,
-- 0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2, 0x72be5d74f27b896f,
0x80deb1fe3b1696b1, 0x9bdc06a725c71235,
-- 0xc19bf174cf692694, 0xe49b69c19ef14ad2, 0xefbe4786384f25e3,
0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65,
-- 0x2de92c6f592b0275, 0x4a7484aa6ea6e483, 0x5cb0a9dcbd41fbd4,
0x76f988da831153b5, 0x983e5152ee66dfab,
-- 0xa831c66d2db43210, 0xb00327c898fb213f, 0xbf597fc7beef0ee4,
0xc6e00bf33da88fc2, 0xd5a79147930aa725,
-- 0x06ca6351e003826f, 0x142929670a0e6e70, 0x27b70a8546d22ffc,
0x2e1b21385c26c926, 0x4d2c6dfc5ac42aed,
-- 0x53380d139d95b3df, 0x650a73548baf63de, 0x766a0abb3c77b2a8,
0x81c2c92e47edaee6, 0x92722c851482353b,
-- 0xa2bfe8a14cf10364, 0xa81a664bbc423001, 0xc24b8b70d0f89791,
0xc76c51a30654be30, 0xd192e819d6ef5218,
-- 0xd69906245565a910, 0xf40e35855771202a, 0x106aa07032bbd1b8,
0x19a4c116b8d2d0c8, 0x1e376c085141ab53,
-- 0x2748774cdf8eeb99, 0x34b0bcb5e19b48a8, 0x391c0cb3c5c95a63,
0x4ed8aa4ae3418acb, 0x5b9cca4f7763e373,
-- 0x682e6ff3d6b2b8a3, 0x748f82ee5defb2fc, 0x78a5636f43172f60,
0x84c87814a1f0ab72, 0x8cc702081a6439ec,
-- 0x90befffa23631e28, 0xa4506cebde82bde9, 0xbef9a3f7b2c67915,
0xc67178f2e372532b, 0xca273eceea26619c,
-- 0xd186b8c721c0c207, 0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178,
0x06f067aa72176fba, 0x0a637dc5a2c898a6,
-- 0x113f9804bef90dae, 0x1b710b35131c471b, 0x28db77f523047d84,
0x32caab7b40c72493, 0x3c9ebe0a15c9bebc,
-- 0x431d67c49c100d4c, 0x4cc5d4becb3e42b6, 0x597f299cfc657e2a,
0x5fcb6fab3ad6faec, 0x6c44198c4a475817
-+ 0x428a2f98d728ae22LL, 0x7137449123ef65cdLL, 0xb5c0fbcfec4d3b2fLL,
0xe9b5dba58189dbbcLL, 0x3956c25bf348b538LL,
-+ 0x59f111f1b605d019LL, 0x923f82a4af194f9bLL, 0xab1c5ed5da6d8118LL,
0xd807aa98a3030242LL, 0x12835b0145706fbeLL,
-+ 0x243185be4ee4b28cLL, 0x550c7dc3d5ffb4e2LL, 0x72be5d74f27b896fLL,
0x80deb1fe3b1696b1LL, 0x9bdc06a725c71235LL,
-+ 0xc19bf174cf692694LL, 0xe49b69c19ef14ad2LL, 0xefbe4786384f25e3LL,
0x0fc19dc68b8cd5b5LL, 0x240ca1cc77ac9c65LL,
-+ 0x2de92c6f592b0275LL, 0x4a7484aa6ea6e483LL, 0x5cb0a9dcbd41fbd4LL,
0x76f988da831153b5LL, 0x983e5152ee66dfabLL,
-+ 0xa831c66d2db43210LL, 0xb00327c898fb213fLL, 0xbf597fc7beef0ee4LL,
0xc6e00bf33da88fc2LL, 0xd5a79147930aa725LL,
-+ 0x06ca6351e003826fLL, 0x142929670a0e6e70LL, 0x27b70a8546d22ffcLL,
0x2e1b21385c26c926LL, 0x4d2c6dfc5ac42aedLL,
-+ 0x53380d139d95b3dfLL, 0x650a73548baf63deLL, 0x766a0abb3c77b2a8LL,
0x81c2c92e47edaee6LL, 0x92722c851482353bLL,
-+ 0xa2bfe8a14cf10364LL, 0xa81a664bbc423001LL, 0xc24b8b70d0f89791LL,
0xc76c51a30654be30LL, 0xd192e819d6ef5218LL,
-+ 0xd69906245565a910LL, 0xf40e35855771202aLL, 0x106aa07032bbd1b8LL,
0x19a4c116b8d2d0c8LL, 0x1e376c085141ab53LL,
-+ 0x2748774cdf8eeb99LL, 0x34b0bcb5e19b48a8LL, 0x391c0cb3c5c95a63LL,
0x4ed8aa4ae3418acbLL, 0x5b9cca4f7763e373LL,
-+ 0x682e6ff3d6b2b8a3LL, 0x748f82ee5defb2fcLL, 0x78a5636f43172f60LL,
0x84c87814a1f0ab72LL, 0x8cc702081a6439ecLL,
-+ 0x90befffa23631e28LL, 0xa4506cebde82bde9LL, 0xbef9a3f7b2c67915LL,
0xc67178f2e372532bLL, 0xca273eceea26619cLL,
-+ 0xd186b8c721c0c207LL, 0xeada7dd6cde0eb1eLL, 0xf57d4f7fee6ed178LL,
0x06f067aa72176fbaLL, 0x0a637dc5a2c898a6LL,
-+ 0x113f9804bef90daeLL, 0x1b710b35131c471bLL, 0x28db77f523047d84LL,
0x32caab7b40c72493LL, 0x3c9ebe0a15c9bebcLL,
-+ 0x431d67c49c100d4cLL, 0x4cc5d4becb3e42b6LL, 0x597f299cfc657e2aLL,
0x5fcb6fab3ad6faecLL, 0x6c44198c4a475817LL
- };
-
- static inline uint64_t rotr(uint64_t x, uint64_t n) {
-@@ -1548,14 +1548,14 @@ static void sha512(Guchar *msg, int msgLen, Guchar *ha
- uint64_t H[8];
- int blkLen = 0, i;
- // setting the initial hash value.
-- H[0] = 0x6a09e667f3bcc908;
-- H[1] = 0xbb67ae8584caa73b;
-- H[2] = 0x3c6ef372fe94f82b;
-- H[3] = 0xa54ff53a5f1d36f1;
-- H[4] = 0x510e527fade682d1;
-- H[5] = 0x9b05688c2b3e6c1f;
-- H[6] = 0x1f83d9abfb41bd6b;
-- H[7] = 0x5be0cd19137e2179;
-+ H[0] = 0x6a09e667f3bcc908LL;
-+ H[1] = 0xbb67ae8584caa73bLL;
-+ H[2] = 0x3c6ef372fe94f82bLL;
-+ H[3] = 0xa54ff53a5f1d36f1LL;
-+ H[4] = 0x510e527fade682d1LL;
-+ H[5] = 0x9b05688c2b3e6c1fLL;
-+ H[6] = 0x1f83d9abfb41bd6bLL;
-+ H[7] = 0x5be0cd19137e2179LL;
-
- for (i = 0; i + 128 <= msgLen; i += 128) {
- sha512HashBlock(msg + i, H);
-@@ -1620,14 +1620,14 @@ static void sha384(Guchar *msg, int msgLen, Guchar *ha
- uint64_t H[8];
- int blkLen, i;
- //setting initial hash values
-- H[0] = 0xcbbb9d5dc1059ed8;
-- H[1] = 0x629a292a367cd507;
-- H[2] = 0x9159015a3070dd17;
-- H[3] = 0x152fecd8f70e5939;
-- H[4] = 0x67332667ffc00b31;
-- H[5] = 0x8eb44a8768581511;
-- H[6] = 0xdb0c2e0d64f98fa7;
-- H[7] = 0x47b5481dbefa4fa4;
-+ H[0] = 0xcbbb9d5dc1059ed8LL;
-+ H[1] = 0x629a292a367cd507LL;
-+ H[2] = 0x9159015a3070dd17LL;
-+ H[3] = 0x152fecd8f70e5939LL;
-+ H[4] = 0x67332667ffc00b31LL;
-+ H[5] = 0x8eb44a8768581511LL;
-+ H[6] = 0xdb0c2e0d64f98fa7LL;
-+ H[7] = 0x47b5481dbefa4fa4LL;
- //SHA 384 will use the same sha512HashBlock function.
- blkLen = 0;
- for (i = 0; i + 128 <= msgLen; i += 128) {
