diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-10 05:25:01 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-10 05:25:01 +0000 |
| commit | 456dbeaab3e2f71f527eae542ab44d1e372b0655 (patch) | |
| tree | 5cee708ec6e4b4e530a4337e7389598dc7cd6144 /app-text/poppler | |
| parent | 65737cf14a7220bd9a487aa2af4ae0e79bd23e86 (diff) | |
gentoo resync : 10.01.2018
Diffstat (limited to 'app-text/poppler')
| -rw-r--r-- | app-text/poppler/Manifest | 3 | ||||
| -rw-r--r-- | app-text/poppler/files/poppler-0.62.0-glibc.patch | 34 | ||||
| -rw-r--r-- | app-text/poppler/poppler-0.62.0-r1.ebuild | 1 |
3 files changed, 37 insertions, 1 deletions
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 6372e25a72b1..67680d12e911 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -16,12 +16,13 @@ AUX poppler-0.57.0-CVE-2017-15565.patch 920 BLAKE2B 4f7c67794d3f6f99b710aad06d52 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d +AUX poppler-0.62.0-glibc.patch 1119 BLAKE2B 680425520a9ea1e7d24639ea3a05ed5a857c09ea6ec48bf60a8a4b37bf725d5f7359fb5dc2708584e5a27fae862fd3ef6b0aabb7b4f0f63e1f4fc0c6c80f2c7f SHA512 4f6f8270513163b09a1861ebe7e83ed1a6150d523773daacbf039c660853bbde17bbdd502135eb56aba1e4812cb5adb7dc39294764b282f0b34aa43b04410fde AUX poppler-0.62.0-openjpeg2.patch 599 BLAKE2B 6227946829d8b04d3c12505f5a9878d78f44925b405c2871c6b69a36b02ec8f411ff3cfe397870606be3d2af1cc5e14f23e42744810a095de8d3788092af3521 SHA512 35539dacc3e40b966c94ab73f3ae9228229472e3729f45844224d65ecc215480386e3e14cfb659a9de59277ca5928b81a9502cd48af91e7bb20e259bc5681170 DIST poppler-0.57.0.tar.xz 1703300 BLAKE2B e4126dff2e0ee140fa4c5c30d5a57da5aff38d4c1f566e4ace22d3fe625949db3a662a8513881702cd5c5c302845998dd462048b5158abaf1d119650c997c84c SHA512 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f DIST poppler-0.61.1.tar.xz 1433696 BLAKE2B 6749466223d3bb0e891c6b26c7f1faa5c774dd47ac94c22474efe4a52af228aeb2abbb8ab268667acaa83fb41293246266124a111740df764eeedbe229fa70aa SHA512 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706 EBUILD poppler-0.57.0-r1.ebuild 4348 BLAKE2B 066b4f63c5347e883078bd8c7af3c345d0962dd12b824d53cb1024b4f40671141436bf4992774a0c1b6f18867c57b4bc88e007ad9d7370b3349dc2b9c8640bc0 SHA512 a93fb043158a88df8f52ef3f426dcc88645b5e9c3dacd5eef7939ab1ee0d016546c04c5508596162326765b3bad07579259bb6985cd33cd1695329dbecf69484 EBUILD poppler-0.61.1.ebuild 3868 BLAKE2B ef755c13d074fcc01a826460fc1edca0574a28c980c3c7703c44a25b0300effeb221209f8b34a19854ea39786626e244d39223b8cce416dd2b4a0021ba52675d SHA512 8dbc4c7892553589e55515622cbad3abb9b8b1933c41a9c4e54cd1dc9ce2ea0bd0e1fce97e7e00ea17a4862bdb55ef0d030b23f35d8ed2af1cde7ad6be1084a1 -EBUILD poppler-0.62.0-r1.ebuild 3515 BLAKE2B 775e584508e001165e54cc7190c01755c4ffe09f92db52f98e8811daab0e74e6b353f223ebf7d65629e36b7dbeb0d755d1ec08af9d558b7607597bc0d6648fa5 SHA512 8e202e9810d5e944a35ddb70ca82b9319eb90dc5208b24848b5ff8da4d51654bdba42aa25f286cf0b90bf292547a99bca8df01440cd0a3a47719df0369146c29 +EBUILD poppler-0.62.0-r1.ebuild 3560 BLAKE2B c1382fbe92062c48ca4d050d6488cf11ff92a1be4ef6e657e2b1365eba60f749b576ab0408cd8eb35120f1597021500109de56dd6b24291f9f3933957d22891a SHA512 2633b0a7b4ebdd65d4d2e6803201c41b38ac22b9ddbb8e710e3feb36ace90f876f5fffa0e6a36c0c69c4202764e8aa711b367bd4459b78a4d21b996bd0969331 EBUILD poppler-9999.ebuild 3529 BLAKE2B 6d9fc0cebe9e50d42863645b8337347d9a30b17bdc959ff85d67c667f35626457b77e615bcb89c4d64d66de4ca127f32695d0a429370efaea4d9a92cc0fb0bdf SHA512 6e78f889d20409846cccfd6ab51f4a76b122f1932326347d9b80dac1abaf58fc16401d2805366613a24809f840c764cddde06fa30ac156d765e5003fd11f2e50 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa diff --git a/app-text/poppler/files/poppler-0.62.0-glibc.patch b/app-text/poppler/files/poppler-0.62.0-glibc.patch new file mode 100644 index 000000000000..6808e91601dc --- /dev/null +++ b/app-text/poppler/files/poppler-0.62.0-glibc.patch @@ -0,0 +1,34 @@ +From 7b434a7ad9333a3b2250d636a517c58d9a12bca2 Mon Sep 17 00:00:00 2001 +From: Pekka Vuorela <pekka.vuorela@jollamobile.com> +Date: Fri, 15 Dec 2017 16:56:20 +0200 +Subject: Honor configuration for building glibc copy of strtok_r + +config.h didn't get included and HAVE_STRTOK_R was never defined. +Now getting via glibc.h. +--- + goo/glibc_strtok_r.cc | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/goo/glibc_strtok_r.cc b/goo/glibc_strtok_r.cc +index e779bf5..e323bc2 100644 +--- a/goo/glibc_strtok_r.cc ++++ b/goo/glibc_strtok_r.cc +@@ -50,12 +50,15 @@ + // Copyright (C) 2012 Alexey Pavlov <alexpux@gmail.com> + // Copyright (C) 2012 Albert Astals Cid <aacid@kde.org> + // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com> ++// Copyright (C) 2017 Pekka Vuorela <pekka.vuorela@jollamobile.com> + // + // To see a description of the changes please see the Changelog file that + // came with your tarball or type make ChangeLog if you are building from git + // + //======================================================================== + ++#include "glibc.h" ++ + #ifndef HAVE_STRTOK_R + + #include <string.h> +-- +cgit v1.1 + diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild index b582e20f1f79..9b19e865af5f 100644 --- a/app-text/poppler/poppler-0.62.0-r1.ebuild +++ b/app-text/poppler/poppler-0.62.0-r1.ebuild @@ -61,6 +61,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.62.0-openjpeg2.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" + "${FILESDIR}/${P}-glibc.patch" # bug 643858 ) src_prepare() { |