subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-text\/xpdf\/"

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2019-03-21 Thread Andrew Savchenko

commit: 0a41a80fe3a6ef79385c29bb540684f9aa00d42f
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Thu Mar 21 10:59:47 2019 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Thu Mar 21 11:00:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a41a80f

app-text/xpdf: remove old and vulnerable version

Bug: https://bugs.gentoo.org/681112
Bug: https://bugs.gentoo.org/681140
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/Manifest  |   1 -
 app-text/xpdf/xpdf-4.0.1.ebuild | 116 
 2 files changed, 117 deletions(-)

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 26970c5f24c..00c30eaac70 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,5 +1,4 @@
 DIST xpdf-4.01.01.tar.gz 891962 BLAKE2B 
500cec4091f1ea4fda2008febcfbbe758663d26a1a2a9842abd8630c41a29f6f9fa9839a4b286a2d42e8d686d33084335ad7aa5775c1142cc196b38ef70914d6
 SHA512 
e0b42195ba4858ecf2ec3c3c06a42eae742eb8567dca695a45a01185b606b399b5e45d220b24ed39782d1f9b1ee16f674129db3346d25b709bbb3f90ef078c22
-DIST xpdf-4.01.tar.gz 891150 BLAKE2B 
6280bf9d4c17894a22e63d3fdbe3c67679657121196f84964c1353cb2f09348c38de327f7a6259831afb2ff748340c94196eec11b24a442c6e76dbc170d62ac7
 SHA512 
327d8bcf1f30a0fdbbdc33e2262d4e7de44f28a0f42cc87bbee6b2a8059d8cca8ffa715f7e810f9b53deb690bf9744ae5e8cf86a101941b8103100ded89e36e6
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 
5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab
 SHA512 
1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
 DIST xpdf-chinese-simplified.tar.gz 918277 BLAKE2B 
ad41cc6ceae8d5295e49e6cb6356885a77dd314fd55cae95f4adf7ca597c7d86c0029b2767b1ecae86883d31cf9acc5d67997e1ab7871f10d2b6550734bb3b34
 SHA512 
1f016ff06301cf445546b380fe4cf0c1c9ef08b5e37bd392ca975b4a54fa43afbe251c31e14f216c68fb38dcf04f40ab5baf828586734efb7881a755f92cc49e
 DIST xpdf-chinese-traditional.tar.gz 906297 BLAKE2B 
63f4e482b0ba127331ae9adaa69a64ac868e5973d631cec57867ccab83566b61c37771be28c42d02994f574e7bf0fe16813d2d18d6ef5869dc1200f702d7c6dc
 SHA512 
6fec238af3c76f149087bb4445786cb1de31fbcb17982b8da779e71a91e76c780dde7970515eaa6131db2e654d04d13aebe8d840203293b9072850c5d1e6ba0b

diff --git a/app-text/xpdf/xpdf-4.0.1.ebuild b/app-text/xpdf/xpdf-4.0.1.ebuild
deleted file mode 100644
index 1a243e175e9..000
--- a/app-text/xpdf/xpdf-4.0.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-MY_P=${PN}-$(ver_rs 2 "")
-DESCRIPTION="The PDF viewer and tools"
-HOMEPAGE="https://www.xpdfreader.com";
-SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${MY_P}.tar.gz
-   i18n? (
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
-   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
-   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
-   )"
-
-LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cmyk cups i18n +libpaper metric opi png +textselect utils"
-
-DEPEND="
-   cups? (
-   dev-qt/qtprintsupport:5
-   net-print/cups
-   )
-   libpaper? ( app-text/libpaper )
-   utils? ( png? ( media-libs/libpng:0 ) )
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5
-   media-libs/freetype
-   sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-   media-fonts/urw-fonts
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-automagic.patch
-   "${FILESDIR}"/${PN}-visibility.patch
-   "${FILESDIR}"/${PN}-shared-libs.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-   sed -i \
-   "s|/usr/local/etc|${EPREFIX}/etc|;
-s|/usr/local|${EPREFIX}/usr|" \
-   doc/sample-xpdfrc || die
-
-   if use i18n; then
-   sed -i "s|/usr/local|${EPREFIX}/usr|" 
"${WORKDIR}"/*/add-to-xpdfrc || die
-   fi
-
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DA4_PAPER=$(usex metric)
-   -DNO_TEXT_SELECT=$(usex textselect off on)
-   -DOPI_SUPPORT=$(usex

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2019-03-21 Thread Andrew Savchenko

commit: 6b695c59184713a18e2a7809f40088eff130afb6
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Thu Mar 21 10:55:44 2019 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Thu Mar 21 11:00:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b695c59

app-text/xpdf: security version bump

xpdf-4.01.01 fixes several vulnerabilities and problems reported by
Loginsoft, including CVE-2019-9589.

CVE-2019-9588 and CVE-2019-9587 are probably fixed as well, but it
is not clear from ChangeLog:

The PDFDoc(BaseStream) initializer wasn't working correctly.
Fixed a missing array bounds check in PSOutputDev.  [Thanks to
  Loginsoft for the bug report.]
^-- CVE-2019-9589
If the "U" string used for RC4 decryption is short, Adobe apparently
  zero-pads it, so Xpdf now does the same.
^-- Maybe CVE-2019-9588
Pdffonts now checks more carefully for loops between objects.
^-- Looks like CVE-2019-9587
Fixed a problem parsing large real numbers.  [Thanks to Loginsoft for
  the bug report.]

Bug: https://bugs.gentoo.org/681112
Bug: https://bugs.gentoo.org/681140
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/Manifest|   1 +
 app-text/xpdf/xpdf-4.01.01.ebuild | 113 ++
 2 files changed, 114 insertions(+)

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 997f9a14c51..26970c5f24c 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,3 +1,4 @@
+DIST xpdf-4.01.01.tar.gz 891962 BLAKE2B 
500cec4091f1ea4fda2008febcfbbe758663d26a1a2a9842abd8630c41a29f6f9fa9839a4b286a2d42e8d686d33084335ad7aa5775c1142cc196b38ef70914d6
 SHA512 
e0b42195ba4858ecf2ec3c3c06a42eae742eb8567dca695a45a01185b606b399b5e45d220b24ed39782d1f9b1ee16f674129db3346d25b709bbb3f90ef078c22
 DIST xpdf-4.01.tar.gz 891150 BLAKE2B 
6280bf9d4c17894a22e63d3fdbe3c67679657121196f84964c1353cb2f09348c38de327f7a6259831afb2ff748340c94196eec11b24a442c6e76dbc170d62ac7
 SHA512 
327d8bcf1f30a0fdbbdc33e2262d4e7de44f28a0f42cc87bbee6b2a8059d8cca8ffa715f7e810f9b53deb690bf9744ae5e8cf86a101941b8103100ded89e36e6
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 
5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab
 SHA512 
1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
 DIST xpdf-chinese-simplified.tar.gz 918277 BLAKE2B 
ad41cc6ceae8d5295e49e6cb6356885a77dd314fd55cae95f4adf7ca597c7d86c0029b2767b1ecae86883d31cf9acc5d67997e1ab7871f10d2b6550734bb3b34
 SHA512 
1f016ff06301cf445546b380fe4cf0c1c9ef08b5e37bd392ca975b4a54fa43afbe251c31e14f216c68fb38dcf04f40ab5baf828586734efb7881a755f92cc49e

diff --git a/app-text/xpdf/xpdf-4.01.01.ebuild 
b/app-text/xpdf/xpdf-4.01.01.ebuild
new file mode 100644
index 000..27221472400
--- /dev/null
+++ b/app-text/xpdf/xpdf-4.01.01.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="The PDF viewer and tools"
+HOMEPAGE="https://www.xpdfreader.com";
+SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
+   i18n? (
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
+   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
+   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
+   )"
+
+LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmyk cups i18n +libpaper metric opi png +textselect utils"
+
+DEPEND="
+   cups? (
+   dev-qt/qtprintsupport:5
+   net-print/cups
+   )
+   libpaper? ( app-text/libpaper )
+   utils? ( png? ( media-libs/libpng:0 ) )
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   media-libs/freetype
+   sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+   media-fonts/urw-fonts
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-automagic.patch
+   "${FILESDIR}"/${PN}-visibility.patch
+   "${FILESDIR}"/${PN}-shared-libs.patch
+)
+
+src_prepare() {
+   sed -i \
+   "s|/usr/local/etc|${EPREFIX}/etc|;
+s|/usr/local|${EPREFIX}/usr|" \
+   doc/sample-xpdfrc || die
+
+   if use i18n; then
+

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2020-04-05 Thread Andrew Savchenko

commit: dfb7b992c74936cfa0d09628c7b02c5dd2dcbd3b
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Apr  5 08:43:57 2020 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun Apr  5 08:43:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfb7b992

app-text/xpdf: fix deps and build issues

- Add missing qtsvg runtime dependency.
- Add fontconfig optional dependency and USE flag.
- Since 1.0 devel versions inkscape changed CLI options for file
  export. Take this into account to allow icons generations using
  both old and new versions of inkscape.

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.02-r3.ebuild | 147 ++
 1 file changed, 147 insertions(+)

diff --git a/app-text/xpdf/xpdf-4.02-r3.ebuild 
b/app-text/xpdf/xpdf-4.02-r3.ebuild
new file mode 100644
index 000..aa94d174acd
--- /dev/null
+++ b/app-text/xpdf/xpdf-4.02-r3.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop xdg
+
+DESCRIPTION="The PDF viewer and tools"
+HOMEPAGE="https://www.xpdfreader.com";
+SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
+   i18n? (
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
+   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
+   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
+   )"
+
+LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
+
+BDEPEND="
+   icons? ( media-gfx/inkscape )
+"
+DEPEND="
+   cups? (
+   dev-qt/qtprintsupport:5
+   net-print/cups
+   )
+   fontconfig? ( media-libs/fontconfig )
+   libpaper? ( app-text/libpaper )
+   utils? ( png? ( media-libs/libpng:0 ) )
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   media-libs/freetype
+   sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+   dev-qt/qtsvg:5
+   media-fonts/urw-fonts
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-automagic.patch
+   "${FILESDIR}"/${PN}-visibility.patch
+   "${FILESDIR}"/${PN}-shared-libs.patch
+   "${FILESDIR}"/${PN}-CVE-2019-17064.patch
+)
+
+src_prepare() {
+   sed -i \
+   "s|/usr/local/etc|${EPREFIX}/etc|;
+s|/usr/local|${EPREFIX}/usr|" \
+   doc/sample-xpdfrc || die
+
+   if use i18n; then
+   sed -i "s|/usr/local|${EPREFIX}/usr|" 
"${WORKDIR}"/*/add-to-xpdfrc || die
+   fi
+
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DA4_PAPER=$(usex metric)
+   -DNO_FONTCONFIG=$(usex fontconfig off on)
+   -DNO_TEXT_SELECT=$(usex textselect off on)
+   -DOPI_SUPPORT=$(usex opi)
+   -DSPLASH_CMYK=$(usex cmyk)
+   -DWITH_LIBPAPER=$(usex libpaper)
+   -DWITH_LIBPNG=$(usex png)
+   -DXPDFWIDGET_PRINTING=$(usex cups)
+   -DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
+   )
+   cmake-utils_src_configure
+}
+
+src_compile() {
+   cmake-utils_src_compile
+
+   if use icons; then
+   local inkarg="-e"
+   has_version -b '>media-gfx/inkscape-0.99' && inkarg="-o"
+
+   sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
+   cd xpdf-qt
+   mkdir $sizes
+   local i
+   for i in $sizes; do
+   inkscape xpdf-icon.svg -w $i -h $i $inkarg $i/xpdf.png
+   done
+   fi
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   domenu "${FILESDIR}/xpdf.desktop"
+   newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
+   if use icons; then
+   local i
+   for i in $sizes; do
+   doicon -s $i xpdf-qt/$i/xpdf.png
+   done
+   unset sizes
+   fi
+
+   insinto /etc
+   newins doc/sample-xpdfrc xpdfrc
+
+   local d i
+   if use utils; then
+   for d in "bin" "share/man/man1"; do
+   pushd "${ED}/usr/${d}" || die
+   for i in

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2020-03-02 Thread Agostino Sarubbo

commit: 9a3e00353155e8a7c994fa73c035f11413630c6e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar  2 09:24:29 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar  2 09:24:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a3e0035

app-text/xpdf: amd64 stable wrt bug #711146

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-text/xpdf/xpdf-4.02-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.02-r2.ebuild 
b/app-text/xpdf/xpdf-4.02-r2.ebuild
index 96d625e1826..b15bf54b394 100644
--- a/app-text/xpdf/xpdf-4.02-r2.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
 
 LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cmyk cups i18n icons +libpaper metric opi png +textselect utils"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2020-03-02 Thread Agostino Sarubbo

commit: 8916f29b60a078edc4627bf80cd202b2c7bd2d4f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar  2 12:31:53 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar  2 12:31:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8916f29b

app-text/xpdf: x86 stable wrt bug #711146

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-text/xpdf/xpdf-4.02-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.02-r2.ebuild 
b/app-text/xpdf/xpdf-4.02-r2.ebuild
index b15bf54b394..c942b87ba90 100644
--- a/app-text/xpdf/xpdf-4.02-r2.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
 
 LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cmyk cups i18n icons +libpaper metric opi png +textselect utils"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2020-03-02 Thread Andrew Savchenko

commit: aa9c839a6550de397a577a9c6eca092badafe3f5
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Mon Mar  2 22:31:36 2020 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Mon Mar  2 22:33:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa9c839a

app-text/xpdf: remove old and vulnerable versions

Bug: https://bugs.gentoo.org/711146
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.02-r1.ebuild | 140 --
 app-text/xpdf/xpdf-4.02.ebuild| 113 --
 2 files changed, 253 deletions(-)

diff --git a/app-text/xpdf/xpdf-4.02-r1.ebuild 
b/app-text/xpdf/xpdf-4.02-r1.ebuild
deleted file mode 100644
index e6444660970..000
--- a/app-text/xpdf/xpdf-4.02-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop xdg
-
-DESCRIPTION="The PDF viewer and tools"
-HOMEPAGE="https://www.xpdfreader.com";
-SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
-   i18n? (
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
-   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
-   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
-   )"
-
-LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cmyk cups i18n icons +libpaper metric opi png +textselect utils"
-
-BDEPEND="
-   icons? ( media-gfx/inkscape )
-"
-DEPEND="
-   cups? (
-   dev-qt/qtprintsupport:5
-   net-print/cups
-   )
-   libpaper? ( app-text/libpaper )
-   utils? ( png? ( media-libs/libpng:0 ) )
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5
-   media-libs/freetype
-   sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-   media-fonts/urw-fonts
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-automagic.patch
-   "${FILESDIR}"/${PN}-visibility.patch
-   "${FILESDIR}"/${PN}-shared-libs.patch
-)
-
-src_prepare() {
-   sed -i \
-   "s|/usr/local/etc|${EPREFIX}/etc|;
-s|/usr/local|${EPREFIX}/usr|" \
-   doc/sample-xpdfrc || die
-
-   if use i18n; then
-   sed -i "s|/usr/local|${EPREFIX}/usr|" 
"${WORKDIR}"/*/add-to-xpdfrc || die
-   fi
-
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DA4_PAPER=$(usex metric)
-   -DNO_TEXT_SELECT=$(usex textselect off on)
-   -DOPI_SUPPORT=$(usex opi)
-   -DSPLASH_CMYK=$(usex cmyk)
-   -DWITH_LIBPAPER=$(usex libpaper)
-   -DWITH_LIBPNG=$(usex png)
-   -DXPDFWIDGET_PRINTING=$(usex cups)
-   -DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
-   )
-   cmake-utils_src_configure
-}
-
-src_compile() {
-   cmake-utils_src_compile
-
-   if use icons; then
-   sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
-   cd xpdf-qt
-   mkdir $sizes
-   local i
-   for i in $sizes; do
-   inkscape xpdf-icon.svg -w $i -h $i -e $i/xpdf.png
-   done
-   fi
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   domenu "${FILESDIR}/xpdf.desktop"
-   newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
-   if use icons; then
-   local i
-   for i in $sizes; do
-   doicon -s $i xpdf-qt/$i/xpdf.png
-   done
-   unset sizes
-   fi
-
-   insinto /etc
-   newins doc/sample-xpdfrc xpdfrc
-
-   local d i
-   if use utils; then
-   for d in "bin" "share/man/man1"; do
-   pushd "${ED}/usr/${d}" || die
-   for i in pdf*; do
-   mv "${i}" "x${i}" || die
-   done
-   popd || die
-   done
-
-   einfo "PDF utilities were renamed from pdf* to xpdf* to avoid 
file collisions"
-   einfo "with other packages"
-   else
-   rm -rf "${ED}"/usr/bin/pdf* \
-  "${ED}"/usr/share/man/man1/pdf* \
-  "${ED

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2019-10-23 Thread Andrew Savchenko

commit: ac2df5b64a359f2c40900b207e981f07a0a4f267
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed Oct 23 14:34:07 2019 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Wed Oct 23 14:34:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac2df5b6

app-text/xpdf: version bump

Bump to xpdf-4.02. This fixes many bugs including CVEs.

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/Manifest |   1 +
 app-text/xpdf/xpdf-4.02.ebuild | 113 +
 2 files changed, 114 insertions(+)

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 00c30eaac70..11f337e9fc1 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,4 +1,5 @@
 DIST xpdf-4.01.01.tar.gz 891962 BLAKE2B 
500cec4091f1ea4fda2008febcfbbe758663d26a1a2a9842abd8630c41a29f6f9fa9839a4b286a2d42e8d686d33084335ad7aa5775c1142cc196b38ef70914d6
 SHA512 
e0b42195ba4858ecf2ec3c3c06a42eae742eb8567dca695a45a01185b606b399b5e45d220b24ed39782d1f9b1ee16f674129db3346d25b709bbb3f90ef078c22
+DIST xpdf-4.02.tar.gz 912885 BLAKE2B 
70dec3d213566c1a7c13edd05e4f6145b45ad4c4805843393e0f86a07820511a5187cd61a04adf3c3fc671840acdb3b1bbb19dda7dc101df75e564971f51b76f
 SHA512 
72c9413fc7241dde5288137ca8a68c837d2a68e95e909dbe2afe8f374b5a7c92af4edf82918963d1c6388c947057fcf5f0ae1e6fbb2b31c3d5eb9a07d3c74ddc
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 
5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab
 SHA512 
1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
 DIST xpdf-chinese-simplified.tar.gz 918277 BLAKE2B 
ad41cc6ceae8d5295e49e6cb6356885a77dd314fd55cae95f4adf7ca597c7d86c0029b2767b1ecae86883d31cf9acc5d67997e1ab7871f10d2b6550734bb3b34
 SHA512 
1f016ff06301cf445546b380fe4cf0c1c9ef08b5e37bd392ca975b4a54fa43afbe251c31e14f216c68fb38dcf04f40ab5baf828586734efb7881a755f92cc49e
 DIST xpdf-chinese-traditional.tar.gz 906297 BLAKE2B 
63f4e482b0ba127331ae9adaa69a64ac868e5973d631cec57867ccab83566b61c37771be28c42d02994f574e7bf0fe16813d2d18d6ef5869dc1200f702d7c6dc
 SHA512 
6fec238af3c76f149087bb4445786cb1de31fbcb17982b8da779e71a91e76c780dde7970515eaa6131db2e654d04d13aebe8d840203293b9072850c5d1e6ba0b

diff --git a/app-text/xpdf/xpdf-4.02.ebuild b/app-text/xpdf/xpdf-4.02.ebuild
new file mode 100644
index 000..27221472400
--- /dev/null
+++ b/app-text/xpdf/xpdf-4.02.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="The PDF viewer and tools"
+HOMEPAGE="https://www.xpdfreader.com";
+SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
+   i18n? (
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
+   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
+   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
+   )"
+
+LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmyk cups i18n +libpaper metric opi png +textselect utils"
+
+DEPEND="
+   cups? (
+   dev-qt/qtprintsupport:5
+   net-print/cups
+   )
+   libpaper? ( app-text/libpaper )
+   utils? ( png? ( media-libs/libpng:0 ) )
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   media-libs/freetype
+   sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+   media-fonts/urw-fonts
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-automagic.patch
+   "${FILESDIR}"/${PN}-visibility.patch
+   "${FILESDIR}"/${PN}-shared-libs.patch
+)
+
+src_prepare() {
+   sed -i \
+   "s|/usr/local/etc|${EPREFIX}/etc|;
+s|/usr/local|${EPREFIX}/usr|" \
+   doc/sample-xpdfrc || die
+
+   if use i18n; then
+   sed -i "s|/usr/local|${EPREFIX}/usr|" 
"${WORKDIR}"/*/add-to-xpdfrc || die
+   fi
+
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DA4_PAPER=$(usex metric)
+   -DNO_TEXT_SELECT=$(usex textselect off on)
+   -DOPI_SUPPORT=$(usex opi)
+   -DSPLASH_CMYK=$(usex cmyk)
+   -DWITH_LIBPAPER=$(usex libpaper)
+

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2019-10-27 Thread Andrew Savchenko

commit: 4200b42667589b1f425801d9128935b2a9b98134
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Oct 27 09:28:12 2019 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun Oct 27 09:28:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4200b426

app-text/xpdf: remove old and vulnerable version

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/Manifest|   1 -
 app-text/xpdf/xpdf-4.01.01.ebuild | 113 --
 2 files changed, 114 deletions(-)

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 11f337e9fc1..f777d0be04f 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,4 +1,3 @@
-DIST xpdf-4.01.01.tar.gz 891962 BLAKE2B 
500cec4091f1ea4fda2008febcfbbe758663d26a1a2a9842abd8630c41a29f6f9fa9839a4b286a2d42e8d686d33084335ad7aa5775c1142cc196b38ef70914d6
 SHA512 
e0b42195ba4858ecf2ec3c3c06a42eae742eb8567dca695a45a01185b606b399b5e45d220b24ed39782d1f9b1ee16f674129db3346d25b709bbb3f90ef078c22
 DIST xpdf-4.02.tar.gz 912885 BLAKE2B 
70dec3d213566c1a7c13edd05e4f6145b45ad4c4805843393e0f86a07820511a5187cd61a04adf3c3fc671840acdb3b1bbb19dda7dc101df75e564971f51b76f
 SHA512 
72c9413fc7241dde5288137ca8a68c837d2a68e95e909dbe2afe8f374b5a7c92af4edf82918963d1c6388c947057fcf5f0ae1e6fbb2b31c3d5eb9a07d3c74ddc
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 
5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab
 SHA512 
1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
 DIST xpdf-chinese-simplified.tar.gz 918277 BLAKE2B 
ad41cc6ceae8d5295e49e6cb6356885a77dd314fd55cae95f4adf7ca597c7d86c0029b2767b1ecae86883d31cf9acc5d67997e1ab7871f10d2b6550734bb3b34
 SHA512 
1f016ff06301cf445546b380fe4cf0c1c9ef08b5e37bd392ca975b4a54fa43afbe251c31e14f216c68fb38dcf04f40ab5baf828586734efb7881a755f92cc49e

diff --git a/app-text/xpdf/xpdf-4.01.01.ebuild 
b/app-text/xpdf/xpdf-4.01.01.ebuild
deleted file mode 100644
index 27221472400..000
--- a/app-text/xpdf/xpdf-4.01.01.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="The PDF viewer and tools"
-HOMEPAGE="https://www.xpdfreader.com";
-SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
-   i18n? (
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
-   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
-   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
-   )"
-
-LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cmyk cups i18n +libpaper metric opi png +textselect utils"
-
-DEPEND="
-   cups? (
-   dev-qt/qtprintsupport:5
-   net-print/cups
-   )
-   libpaper? ( app-text/libpaper )
-   utils? ( png? ( media-libs/libpng:0 ) )
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5
-   media-libs/freetype
-   sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-   media-fonts/urw-fonts
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-automagic.patch
-   "${FILESDIR}"/${PN}-visibility.patch
-   "${FILESDIR}"/${PN}-shared-libs.patch
-)
-
-src_prepare() {
-   sed -i \
-   "s|/usr/local/etc|${EPREFIX}/etc|;
-s|/usr/local|${EPREFIX}/usr|" \
-   doc/sample-xpdfrc || die
-
-   if use i18n; then
-   sed -i "s|/usr/local|${EPREFIX}/usr|" 
"${WORKDIR}"/*/add-to-xpdfrc || die
-   fi
-
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DA4_PAPER=$(usex metric)
-   -DNO_TEXT_SELECT=$(usex textselect off on)
-   -DOPI_SUPPORT=$(usex opi)
-   -DSPLASH_CMYK=$(usex cmyk)
-   -DWITH_LIBPAPER=$(usex libpaper)
-   -DWITH_LIBPNG=$(usex png)
-   -DXPDFWIDGET_PRINTING=$(usex cups)
-   -DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
-   )
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   insinto /etc
-   newins doc/sample-xpdfrc xpdfrc
-
-   local d i
-   if u

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2019-10-27 Thread Thomas Deutschmann

commit: e9bd9753bc11b9589b812a8e972c7326a239c491
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Oct 27 23:20:00 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Oct 27 23:20:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9bd9753

app-text/xpdf: x86 stable (bug #698640)

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-text/xpdf/xpdf-4.02.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.02.ebuild b/app-text/xpdf/xpdf-4.02.ebuild
index 27221472400..bd06d056062 100644
--- a/app-text/xpdf/xpdf-4.02.ebuild
+++ b/app-text/xpdf/xpdf-4.02.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
 
 LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="cmyk cups i18n +libpaper metric opi png +textselect utils"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2019-10-28 Thread Agostino Sarubbo

commit: 4e00352b3e88c748eaba8e4b72e9eae9be6ab209
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Oct 28 07:41:27 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Oct 28 07:41:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e00352b

app-text/xpdf: amd64 stable wrt bug #698640

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-text/xpdf/xpdf-4.02.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.02.ebuild b/app-text/xpdf/xpdf-4.02.ebuild
index bd06d056062..4263e9c9ad4 100644
--- a/app-text/xpdf/xpdf-4.02.ebuild
+++ b/app-text/xpdf/xpdf-4.02.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
 
 LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="cmyk cups i18n +libpaper metric opi png +textselect utils"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2020-04-30 Thread Andrew Savchenko

commit: 12add41ec6c64c8f4224154d3a69af61432e1924
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Thu Apr 30 08:32:38 2020 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Thu Apr 30 08:36:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12add41e

app-text/xpdf: fix dep on dev-qt/qtprintsupport

Closes: https://bugs.gentoo.org/720022
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.02-r4.ebuild | 147 ++
 1 file changed, 147 insertions(+)

diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild 
b/app-text/xpdf/xpdf-4.02-r4.ebuild
new file mode 100644
index 000..4e289ea3df2
--- /dev/null
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop xdg
+
+DESCRIPTION="The PDF viewer and tools"
+HOMEPAGE="https://www.xpdfreader.com";
+SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
+   i18n? (
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
+   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
+   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
+   )"
+
+LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
+
+BDEPEND="
+   icons? ( media-gfx/inkscape )
+"
+DEPEND="
+   cups? (
+   dev-qt/qtprintsupport:5[cups]
+   net-print/cups
+   )
+   fontconfig? ( media-libs/fontconfig )
+   libpaper? ( app-text/libpaper )
+   utils? ( png? ( media-libs/libpng:0 ) )
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   media-libs/freetype
+   sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+   dev-qt/qtsvg:5
+   media-fonts/urw-fonts
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-automagic.patch
+   "${FILESDIR}"/${PN}-visibility.patch
+   "${FILESDIR}"/${PN}-shared-libs.patch
+   "${FILESDIR}"/${PN}-CVE-2019-17064.patch
+)
+
+src_prepare() {
+   sed -i \
+   "s|/usr/local/etc|${EPREFIX}/etc|;
+s|/usr/local|${EPREFIX}/usr|" \
+   doc/sample-xpdfrc || die
+
+   if use i18n; then
+   sed -i "s|/usr/local|${EPREFIX}/usr|" 
"${WORKDIR}"/*/add-to-xpdfrc || die
+   fi
+
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DA4_PAPER=$(usex metric)
+   -DNO_FONTCONFIG=$(usex fontconfig off on)
+   -DNO_TEXT_SELECT=$(usex textselect off on)
+   -DOPI_SUPPORT=$(usex opi)
+   -DSPLASH_CMYK=$(usex cmyk)
+   -DWITH_LIBPAPER=$(usex libpaper)
+   -DWITH_LIBPNG=$(usex png)
+   -DXPDFWIDGET_PRINTING=$(usex cups)
+   -DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
+   )
+   cmake-utils_src_configure
+}
+
+src_compile() {
+   cmake-utils_src_compile
+
+   if use icons; then
+   local inkarg="-e"
+   has_version -b '>media-gfx/inkscape-0.99' && inkarg="-o"
+
+   sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
+   cd xpdf-qt
+   mkdir $sizes
+   local i
+   for i in $sizes; do
+   inkscape xpdf-icon.svg -w $i -h $i $inkarg $i/xpdf.png
+   done
+   fi
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   domenu "${FILESDIR}/xpdf.desktop"
+   newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
+   if use icons; then
+   local i
+   for i in $sizes; do
+   doicon -s $i xpdf-qt/$i/xpdf.png
+   done
+   unset sizes
+   fi
+
+   insinto /etc
+   newins doc/sample-xpdfrc xpdfrc
+
+   local d i
+   if use utils; then
+   for d in "bin" "share/man/man1"; do
+   pushd "${ED}/usr/${d}" || die
+   for i in pdf*; do
+   mv "${i}" "x${i}" || die
+   done
+   popd || die
+   done
+
+   einfo "PDF utilities were renamed from pdf

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2020-04-30 Thread Andrew Savchenko

commit: 8f337938612c83328af9ea7d980ccd84cbf8c0ed
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Thu Apr 30 08:57:02 2020 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Thu Apr 30 08:57:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f337938

app-text/xpdf: drop old

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.02-r3.ebuild | 147 --
 1 file changed, 147 deletions(-)

diff --git a/app-text/xpdf/xpdf-4.02-r3.ebuild 
b/app-text/xpdf/xpdf-4.02-r3.ebuild
deleted file mode 100644
index aa94d174acd..000
--- a/app-text/xpdf/xpdf-4.02-r3.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop xdg
-
-DESCRIPTION="The PDF viewer and tools"
-HOMEPAGE="https://www.xpdfreader.com";
-SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
-   i18n? (
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
-   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
-   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
-   )"
-
-LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
-
-BDEPEND="
-   icons? ( media-gfx/inkscape )
-"
-DEPEND="
-   cups? (
-   dev-qt/qtprintsupport:5
-   net-print/cups
-   )
-   fontconfig? ( media-libs/fontconfig )
-   libpaper? ( app-text/libpaper )
-   utils? ( png? ( media-libs/libpng:0 ) )
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5
-   media-libs/freetype
-   sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-   dev-qt/qtsvg:5
-   media-fonts/urw-fonts
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-automagic.patch
-   "${FILESDIR}"/${PN}-visibility.patch
-   "${FILESDIR}"/${PN}-shared-libs.patch
-   "${FILESDIR}"/${PN}-CVE-2019-17064.patch
-)
-
-src_prepare() {
-   sed -i \
-   "s|/usr/local/etc|${EPREFIX}/etc|;
-s|/usr/local|${EPREFIX}/usr|" \
-   doc/sample-xpdfrc || die
-
-   if use i18n; then
-   sed -i "s|/usr/local|${EPREFIX}/usr|" 
"${WORKDIR}"/*/add-to-xpdfrc || die
-   fi
-
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DA4_PAPER=$(usex metric)
-   -DNO_FONTCONFIG=$(usex fontconfig off on)
-   -DNO_TEXT_SELECT=$(usex textselect off on)
-   -DOPI_SUPPORT=$(usex opi)
-   -DSPLASH_CMYK=$(usex cmyk)
-   -DWITH_LIBPAPER=$(usex libpaper)
-   -DWITH_LIBPNG=$(usex png)
-   -DXPDFWIDGET_PRINTING=$(usex cups)
-   -DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
-   )
-   cmake-utils_src_configure
-}
-
-src_compile() {
-   cmake-utils_src_compile
-
-   if use icons; then
-   local inkarg="-e"
-   has_version -b '>media-gfx/inkscape-0.99' && inkarg="-o"
-
-   sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
-   cd xpdf-qt
-   mkdir $sizes
-   local i
-   for i in $sizes; do
-   inkscape xpdf-icon.svg -w $i -h $i $inkarg $i/xpdf.png
-   done
-   fi
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   domenu "${FILESDIR}/xpdf.desktop"
-   newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
-   if use icons; then
-   local i
-   for i in $sizes; do
-   doicon -s $i xpdf-qt/$i/xpdf.png
-   done
-   unset sizes
-   fi
-
-   insinto /etc
-   newins doc/sample-xpdfrc xpdfrc
-
-   local d i
-   if use utils; then
-   for d in "bin" "share/man/man1"; do
-   pushd "${ED}/usr/${d}" || die
-   for i in pdf*; do
-   mv "${i}" "x${i}" || die
-   done
-   popd || die
-   done
-
-   einfo "PDF utilities were renamed from pdf* to xpdf* to avoid 
file collisions"
-   einfo "with

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2020-04-30 Thread Agostino Sarubbo

commit: 8af518fcfb687a098f314bbe2524178211bd0b12
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Apr 30 15:56:18 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Apr 30 15:56:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af518fc

app-text/xpdf: amd64 stable wrt bug #720104

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-text/xpdf/xpdf-4.02-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild 
b/app-text/xpdf/xpdf-4.02-r4.ebuild
index 4e289ea3df2..fa244803471 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
 
 LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2020-04-30 Thread Agostino Sarubbo

commit: 5d9f37d2ce2b1d03a5e53c832c09c63b484d9a03
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Apr 30 16:00:02 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Apr 30 16:00:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d9f37d2

app-text/xpdf: x86 stable wrt bug #720104

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-text/xpdf/xpdf-4.02-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild 
b/app-text/xpdf/xpdf-4.02-r4.ebuild
index fa244803471..4311f1b32ef 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
 
 LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2020-04-30 Thread Andrew Savchenko

commit: f2e97d26d315297c9014abc9e6c1fd3d5aa4f44a
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Thu Apr 30 20:17:39 2020 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Thu Apr 30 20:19:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e97d26

app-text/xpdf: drop old

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.02-r2.ebuild | 141 --
 1 file changed, 141 deletions(-)

diff --git a/app-text/xpdf/xpdf-4.02-r2.ebuild 
b/app-text/xpdf/xpdf-4.02-r2.ebuild
deleted file mode 100644
index c942b87ba90..000
--- a/app-text/xpdf/xpdf-4.02-r2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop xdg
-
-DESCRIPTION="The PDF viewer and tools"
-HOMEPAGE="https://www.xpdfreader.com";
-SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
-   i18n? (
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
-   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
-   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
-   https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
-   )"
-
-LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cmyk cups i18n icons +libpaper metric opi png +textselect utils"
-
-BDEPEND="
-   icons? ( media-gfx/inkscape )
-"
-DEPEND="
-   cups? (
-   dev-qt/qtprintsupport:5
-   net-print/cups
-   )
-   libpaper? ( app-text/libpaper )
-   utils? ( png? ( media-libs/libpng:0 ) )
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5
-   media-libs/freetype
-   sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-   media-fonts/urw-fonts
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-automagic.patch
-   "${FILESDIR}"/${PN}-visibility.patch
-   "${FILESDIR}"/${PN}-shared-libs.patch
-   "${FILESDIR}"/${PN}-CVE-2019-17064.patch
-)
-
-src_prepare() {
-   sed -i \
-   "s|/usr/local/etc|${EPREFIX}/etc|;
-s|/usr/local|${EPREFIX}/usr|" \
-   doc/sample-xpdfrc || die
-
-   if use i18n; then
-   sed -i "s|/usr/local|${EPREFIX}/usr|" 
"${WORKDIR}"/*/add-to-xpdfrc || die
-   fi
-
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DA4_PAPER=$(usex metric)
-   -DNO_TEXT_SELECT=$(usex textselect off on)
-   -DOPI_SUPPORT=$(usex opi)
-   -DSPLASH_CMYK=$(usex cmyk)
-   -DWITH_LIBPAPER=$(usex libpaper)
-   -DWITH_LIBPNG=$(usex png)
-   -DXPDFWIDGET_PRINTING=$(usex cups)
-   -DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
-   )
-   cmake-utils_src_configure
-}
-
-src_compile() {
-   cmake-utils_src_compile
-
-   if use icons; then
-   sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
-   cd xpdf-qt
-   mkdir $sizes
-   local i
-   for i in $sizes; do
-   inkscape xpdf-icon.svg -w $i -h $i -e $i/xpdf.png
-   done
-   fi
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   domenu "${FILESDIR}/xpdf.desktop"
-   newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
-   if use icons; then
-   local i
-   for i in $sizes; do
-   doicon -s $i xpdf-qt/$i/xpdf.png
-   done
-   unset sizes
-   fi
-
-   insinto /etc
-   newins doc/sample-xpdfrc xpdfrc
-
-   local d i
-   if use utils; then
-   for d in "bin" "share/man/man1"; do
-   pushd "${ED}/usr/${d}" || die
-   for i in pdf*; do
-   mv "${i}" "x${i}" || die
-   done
-   popd || die
-   done
-
-   einfo "PDF utilities were renamed from pdf* to xpdf* to avoid 
file collisions"
-   einfo "with other packages"
-   else
-   rm -rf "${ED}"/usr/bin/pdf* \
-  "${ED}"/usr/share/man/man1/pdf* \
-  "${ED}"/usr/$(get_libdir) || die
-   fi
-
-   if use i18n; then
-   for i

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2022-05-15 Thread Andrew Savchenko

commit: 7de5ff2a819eb06c7cb3ae30728a82670f0462f6
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun May 15 13:49:16 2022 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun May 15 13:57:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de5ff2a

app-text/xpdf: Update to 4.04.

This fixes numerous security issues.

Bug: https://bugs.gentoo.org/840873
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/Manifest |   2 +
 app-text/xpdf/xpdf-4.04.ebuild | 149 +
 2 files changed, 151 insertions(+)

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index af00a43fdcac..46bf6536f101 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,4 +1,6 @@
 DIST xpdf-4.03.tar.gz 936046 BLAKE2B 
bd0198ec6be627edce6386f0d93b0921906b2c5f79b3eb02f89719e64cbe3ca3b2df53db8aecc6df3581eb022ca0d4c209a880760e5bbb3eb46b40b106d6d144
 SHA512 
5f8478c2c4863a3c50f9b45a6fec73c7e67a74adbeaa651dd2e29982ea4cf050740874ee670672f985a323c12c28c968c16238c4238aeb52810a45e2728d622f
+DIST xpdf-4.04.tar.gz 969535 BLAKE2B 
981f791c098b4632dd65ad581c0284beb730ebe1935dbe942882aa63fb23920eb241334e946ba9be07b5bc1b0c73effcccb2c8b2c95182a06d35a745862926a8
 SHA512 
a26b67a4b3d5a5a365153845bf72d77949e683ce26aaf4705b49194cb32bbc581617c3e9c37f74bf6c49480df06d49e8c38d41233966b6215eacf92591d4d9bf
+DIST xpdf-4.04.tar.gz.sig 801 BLAKE2B 
2f2b5c6a70ae007165afd3ec78c2fe168a380f6960176cc6c655a235aa83c1f7e608c5fd82cbce0b0877a92e3dea76950db450b96527eb14813ddcab2125a3ab
 SHA512 
4c2740cf6a659e896584339a1238089465a548547c829f047d0313e46f6e3bba6c404ff37df7baf2f5d0c317d6ec954167f31bb1501a65e638b2617c6730d925
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 
5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab
 SHA512 
1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
 DIST xpdf-chinese-simplified-20201222.tar.gz 912967 BLAKE2B 
74eb8da7642147cc6a0d5ee92379823786a78d0dccbdc1d4eab46094d15009bbe72599152b5001c58e7a88bfbb2f7af515e3582e293367a5b0a12bb1c017e8e1
 SHA512 
91c80dc4173a7b40267af1c95708f24557fb56ffc72cbaf48e9adcb0fc310b1bb40f327a8f36b3c6024317e98a44a8ab04d99f6f7b1ea81e775686534f0251ef
 DIST xpdf-chinese-traditional-20201222.tar.gz 922808 BLAKE2B 
39a9bc094061298eb2afbdb8a53d71bf4e1fb1fbe33ca7a8855a34e4ece1b319edc334db71fec72df1860362878b401557fb623eaa2ca8c7ed973d5344e57e75
 SHA512 
c7709409f00365fea83f92db74401b6afbe4ceab9290d9471b9226b71ff24823d19054472d5700fbd91043859e78958628b82afa8b0361544247a76cf9d21d1e

diff --git a/app-text/xpdf/xpdf-4.04.ebuild b/app-text/xpdf/xpdf-4.04.ebuild
new file mode 100644
index ..aaedc7d90ef4
--- /dev/null
+++ b/app-text/xpdf/xpdf-4.04.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/xpdf.asc
+inherit cmake desktop verify-sig xdg
+
+DESCRIPTION="The PDF viewer and tools"
+HOMEPAGE="https://www.xpdfreader.com";
+SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
+   i18n? (
+   https://dl.xpdfreader.com/xpdf-arabic.tar.gz
+   https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> 
xpdf-chinese-simplified-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> 
xpdf-chinese-traditional-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
+   https://dl.xpdfreader.com/xpdf-greek.tar.gz
+   https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
+   https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> 
xpdf-japanese-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-korean.tar.gz -> 
xpdf-korean-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-latin2.tar.gz
+   https://dl.xpdfreader.com/xpdf-thai.tar.gz
+   https://dl.xpdfreader.com/xpdf-turkish.tar.gz
+   )
+   verify-sig? ( https://dl.xpdfreader.com/${P}.tar.gz.sig )"
+
+LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
+
+BDEPEND="
+   icons? ( gnome-base/librsvg )
+   verify-sig? ( sec-keys/openpgp-keys-xpdf )
+"
+DEPEND="
+   cups? (
+   dev-qt/qtprintsupport:5[cups]
+   net-print/cups
+   )
+   fontconfig? ( media-libs/fontconfig )
+   libpaper? ( app-text/libpaper )
+   utils? ( png? ( media-libs/libpng:0 ) )
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   media-libs/freetype
+   sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+   dev-qt/qtsvg:5
+   media-fonts/urw-fonts
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-automagic.patch
+   "${FILESDIR}"/${PN}-visibility.patch
+   "${FILESDIR}"/${

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2021-02-08 Thread Sam James

commit: ae841c2d3dd241cc3896b1f12cbae7dfadb7d93f
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  8 17:26:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  8 17:26:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae841c2d

app-text/xpdf: Stabilize 4.03 x86, #755938

Signed-off-by: Sam James  gentoo.org>

 app-text/xpdf/xpdf-4.03.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.03.ebuild b/app-text/xpdf/xpdf-4.03.ebuild
index 486c4bc1629..07b37ab75cf 100644
--- a/app-text/xpdf/xpdf-4.03.ebuild
+++ b/app-text/xpdf/xpdf-4.03.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
 
 LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2021-02-09 Thread Sam James

commit: 822a8e635768d12b0fb5bff2cc09e21c499fa163
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  9 09:47:15 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  9 09:47:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=822a8e63

app-text/xpdf: Stabilize 4.03 amd64, #755938

Signed-off-by: Sam James  gentoo.org>

 app-text/xpdf/xpdf-4.03.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.03.ebuild b/app-text/xpdf/xpdf-4.03.ebuild
index 07b37ab75cf..c9761c8e26b 100644
--- a/app-text/xpdf/xpdf-4.03.ebuild
+++ b/app-text/xpdf/xpdf-4.03.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
 
 LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2021-01-30 Thread Andrew Savchenko

commit: a76641e3eaf92f7c8b19af72e44c9fea310338c2
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jan 30 09:29:29 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Jan 30 09:51:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a76641e3

app-text/xpdf: update license

It is either GPLv2 or GPLv3, not mix of both; see README:

Xpdf is licensed under the GNU General Public License (GPL), version 2
or 3.  This means that you can distribute derivatives of Xpdf under
any of the following:
  - GPL v2 only
  - GPL v3 only
  - GPL v2 or v3

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.02-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild 
b/app-text/xpdf/xpdf-4.02-r4.ebuild
index e887f2ce996..42e80e86fbd 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
)"
 
-LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
+LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2021-01-30 Thread Andrew Savchenko

commit: ee2f467df6f1d70f5d7e7741ac264c6d2893d323
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jan 30 09:47:21 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Jan 30 09:51:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee2f467d

app-text/xpdf: version bump

This is mostly a bugfix release, it fixes plentiful of bugs (see
CHANGES) including many security issues, including but not limited
to CVE-2020-{25725,35376}.

Bug: https://bugs.gentoo.org/755938
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/Manifest |   1 +
 app-text/xpdf/xpdf-4.03.ebuild | 146 +
 2 files changed, 147 insertions(+)

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 38d054373af..075768e2b3a 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,4 +1,5 @@
 DIST xpdf-4.02.tar.gz 912885 BLAKE2B 
70dec3d213566c1a7c13edd05e4f6145b45ad4c4805843393e0f86a07820511a5187cd61a04adf3c3fc671840acdb3b1bbb19dda7dc101df75e564971f51b76f
 SHA512 
72c9413fc7241dde5288137ca8a68c837d2a68e95e909dbe2afe8f374b5a7c92af4edf82918963d1c6388c947057fcf5f0ae1e6fbb2b31c3d5eb9a07d3c74ddc
+DIST xpdf-4.03.tar.gz 936046 BLAKE2B 
bd0198ec6be627edce6386f0d93b0921906b2c5f79b3eb02f89719e64cbe3ca3b2df53db8aecc6df3581eb022ca0d4c209a880760e5bbb3eb46b40b106d6d144
 SHA512 
5f8478c2c4863a3c50f9b45a6fec73c7e67a74adbeaa651dd2e29982ea4cf050740874ee670672f985a323c12c28c968c16238c4238aeb52810a45e2728d622f
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 
5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab
 SHA512 
1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
 DIST xpdf-chinese-simplified-20201222.tar.gz 912967 BLAKE2B 
74eb8da7642147cc6a0d5ee92379823786a78d0dccbdc1d4eab46094d15009bbe72599152b5001c58e7a88bfbb2f7af515e3582e293367a5b0a12bb1c017e8e1
 SHA512 
91c80dc4173a7b40267af1c95708f24557fb56ffc72cbaf48e9adcb0fc310b1bb40f327a8f36b3c6024317e98a44a8ab04d99f6f7b1ea81e775686534f0251ef
 DIST xpdf-chinese-traditional-20201222.tar.gz 922808 BLAKE2B 
39a9bc094061298eb2afbdb8a53d71bf4e1fb1fbe33ca7a8855a34e4ece1b319edc334db71fec72df1860362878b401557fb623eaa2ca8c7ed973d5344e57e75
 SHA512 
c7709409f00365fea83f92db74401b6afbe4ceab9290d9471b9226b71ff24823d19054472d5700fbd91043859e78958628b82afa8b0361544247a76cf9d21d1e

diff --git a/app-text/xpdf/xpdf-4.03.ebuild b/app-text/xpdf/xpdf-4.03.ebuild
new file mode 100644
index 000..486c4bc1629
--- /dev/null
+++ b/app-text/xpdf/xpdf-4.03.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg
+
+DESCRIPTION="The PDF viewer and tools"
+HOMEPAGE="https://www.xpdfreader.com";
+SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
+   i18n? (
+   https://dl.xpdfreader.com/xpdf-arabic.tar.gz
+   https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> 
xpdf-chinese-simplified-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> 
xpdf-chinese-traditional-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
+   https://dl.xpdfreader.com/xpdf-greek.tar.gz
+   https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
+   https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> 
xpdf-japanese-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-korean.tar.gz -> 
xpdf-korean-20201222.tar.gz
+   https://dl.xpdfreader.com/xpdf-latin2.tar.gz
+   https://dl.xpdfreader.com/xpdf-thai.tar.gz
+   https://dl.xpdfreader.com/xpdf-turkish.tar.gz
+   )"
+
+LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
+
+BDEPEND="
+   icons? ( gnome-base/librsvg )
+"
+DEPEND="
+   cups? (
+   dev-qt/qtprintsupport:5[cups]
+   net-print/cups
+   )
+   fontconfig? ( media-libs/fontconfig )
+   libpaper? ( app-text/libpaper )
+   utils? ( png? ( media-libs/libpng:0 ) )
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   media-libs/freetype
+   sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+   dev-qt/qtsvg:5
+   media-fonts/urw-fonts
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-automagic.patch
+   "${FILESDIR}"/${PN}-visibility.patch
+   "${FILESDIR}"/${PN}-shared-libs.patch
+)
+
+DOCS=( ANNOUNCE CHANGES README )
+
+src_prepare() {
+   sed -i \
+   "s|/usr/local/etc|${EPREFIX}/etc|;
+s|/usr/local|${EPREFIX}/usr|" \
+   doc/sample-xpdfrc || die
+
+   if use i18n; then
+   sed -i "s|/usr/local|${EPREFIX}/usr|" 
"${WORKDIR}"/*/add-to-xp

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2021-01-30 Thread Andrew Savchenko

commit: a11a0db0a8cd5cb501a75b5a5247fa6a9c212bea
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jan 30 09:34:25 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Jan 30 09:51:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a11a0db0

app-text/xpdf: update download links

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/Manifest|  8 
 app-text/xpdf/xpdf-4.02-r4.ebuild | 24 
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index f777d0be04f..38d054373af 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,12 +1,12 @@
 DIST xpdf-4.02.tar.gz 912885 BLAKE2B 
70dec3d213566c1a7c13edd05e4f6145b45ad4c4805843393e0f86a07820511a5187cd61a04adf3c3fc671840acdb3b1bbb19dda7dc101df75e564971f51b76f
 SHA512 
72c9413fc7241dde5288137ca8a68c837d2a68e95e909dbe2afe8f374b5a7c92af4edf82918963d1c6388c947057fcf5f0ae1e6fbb2b31c3d5eb9a07d3c74ddc
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 
5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab
 SHA512 
1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
-DIST xpdf-chinese-simplified.tar.gz 918277 BLAKE2B 
ad41cc6ceae8d5295e49e6cb6356885a77dd314fd55cae95f4adf7ca597c7d86c0029b2767b1ecae86883d31cf9acc5d67997e1ab7871f10d2b6550734bb3b34
 SHA512 
1f016ff06301cf445546b380fe4cf0c1c9ef08b5e37bd392ca975b4a54fa43afbe251c31e14f216c68fb38dcf04f40ab5baf828586734efb7881a755f92cc49e
-DIST xpdf-chinese-traditional.tar.gz 906297 BLAKE2B 
63f4e482b0ba127331ae9adaa69a64ac868e5973d631cec57867ccab83566b61c37771be28c42d02994f574e7bf0fe16813d2d18d6ef5869dc1200f702d7c6dc
 SHA512 
6fec238af3c76f149087bb4445786cb1de31fbcb17982b8da779e71a91e76c780dde7970515eaa6131db2e654d04d13aebe8d840203293b9072850c5d1e6ba0b
+DIST xpdf-chinese-simplified-20201222.tar.gz 912967 BLAKE2B 
74eb8da7642147cc6a0d5ee92379823786a78d0dccbdc1d4eab46094d15009bbe72599152b5001c58e7a88bfbb2f7af515e3582e293367a5b0a12bb1c017e8e1
 SHA512 
91c80dc4173a7b40267af1c95708f24557fb56ffc72cbaf48e9adcb0fc310b1bb40f327a8f36b3c6024317e98a44a8ab04d99f6f7b1ea81e775686534f0251ef
+DIST xpdf-chinese-traditional-20201222.tar.gz 922808 BLAKE2B 
39a9bc094061298eb2afbdb8a53d71bf4e1fb1fbe33ca7a8855a34e4ece1b319edc334db71fec72df1860362878b401557fb623eaa2ca8c7ed973d5344e57e75
 SHA512 
c7709409f00365fea83f92db74401b6afbe4ceab9290d9471b9226b71ff24823d19054472d5700fbd91043859e78958628b82afa8b0361544247a76cf9d21d1e
 DIST xpdf-cyrillic.tar.gz 1656 BLAKE2B 
454b9a276106d61481fdb8da934ac0de50b86a99d882e27bc9e1cf09a03ae2156909df405de78413e0ac3b529af479b2fbdf5978cc1022cee25c50df6ef21f0e
 SHA512 
ab1197c90f8cd3d8664ebbdc7ecefdfb8ec12e24da2f7616cad1d5bc9c7fd172c48db6a18d76172de8342377acc8e1dcd78bcf0fb1ef9f05cf94729e90586827
 DIST xpdf-greek.tar.gz 1259 BLAKE2B 
f9f695b55c48ee2956ccab1ba9c7ae5bcb2df0669efcb8e111c6100f957238ae73b18589e40dece8b0c38212f00a52c1dc381cc5efcca7c97fe261d72470bb6f
 SHA512 
2e0e281e09e1abc2f0e40b6787703538d52cb62edcd4c4156698700a5f908afee290c62ad9a6ff4ea74bc42e0a8fe9a7765a212efbc223512d4bb442448ea52f
 DIST xpdf-hebrew.tar.gz 1317 BLAKE2B 
bfd5bddc250c1ae1e01fe68f1a4caa649d2a443d3c39565b5209d07f32d46e3474e6823f243b08ab6088e4686cb79e58fce5c9a3de271a77c6b1713fa58b1000
 SHA512 
0ebe652f8633151d13ef2403bd293682b511ab86c1391ce187f1fc0274f33bd9c7e6ec682c8f79ac4fd27c74ab81ad2ae334a75f26001092521cff9a73cd0b8a
-DIST xpdf-japanese.tar.gz 1011166 BLAKE2B 
67c2e8045214462737aa2332aa6ddba35581866e22bece5c166aa3fa808da0dddae11b7e9bcfe50f00087b74f1e7694ac8e407268cdefcab1fe60163eb3bdf70
 SHA512 
0d7b6e4c31caae1ec49d43f108d2dacc76fa84b79e9794d2d0071f33d7fadfacd533f0da1d5bcac3ec1c0757dbd6be4279acac1d148620e1d89d7a9af0966a08
-DIST xpdf-korean.tar.gz 526847 BLAKE2B 
e1640f6df0bc1e126b2e0f010403fc3ff068a8171d31cc616dfaff43170acfa69ff5dc0ac732d346d6aa9b2b21549b21e11f98f5038050b5075ee7fff8a93444
 SHA512 
871a9de0e40d7ef9fb42bb2d90558875f5b84962d7f811d5a18f4b68fadbe7c34e2c18c660a160c9ed9539adc22684985f296c77af2ed3bf604d9989bdcb3d1d
+DIST xpdf-japanese-20201222.tar.gz 1012686 BLAKE2B 
14d59d2dd73dc9be913fb7557bce4844d2babbb88a573f9b962e7cc39e55268bb1a93c69c59585dc6b8aea8e6d771571e0105d1b9ee008ff07c80ae606125ed4
 SHA512 
f4e33525038f89c7b6ffb06b5b49726ab66ad1d61f5d0b813054ccefc035871e50996f31f3f67e6079eccf4c00619f582bdb2e1059df70e0101731a1e067d950
+DIST xpdf-korean-20201222.tar.gz 809664 BLAKE2B 
3c3a4397f25ae74ed8bd68d0736144b9f644f79757ce48f435030cc675650aaa919ee95e8ad7a8b039777f3505c78fdf335cfefbf780957b7c5442a25c5e10c4
 SHA512 
1b829f276f9fbf0ab637cef345f1343faa582af2db95f68003c01d1ec96ca0d9ab38093502ac666ad7b4ce55120a9103bd492a9fea1e8287983227d45ebc378f
 DIST xpdf-latin2.tar.gz 1431 BLAKE2B 
db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f359560

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2020-11-09 Thread Andrew Savchenko

commit: 33385b46bea50e05915917ebdb14f6adb97a8797
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Mon Nov  9 18:02:02 2020 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Mon Nov  9 18:04:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33385b46

app-text/xpdf: switch from inkscape to rsvg-convert

rsvg-convert is faster, more lightweight and less troublesome
dependency than inkscape, so use it for png generation.
This is a better fix of bug 739166.

Bug: https://bugs.gentoo.org/739166
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.02-r4.ebuild | 10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild 
b/app-text/xpdf/xpdf-4.02-r4.ebuild
index 288d1e75901..e887f2ce996 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -28,7 +28,7 @@ KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
 
 BDEPEND="
-   icons? ( media-gfx/inkscape )
+   icons? ( gnome-base/librsvg )
 "
 DEPEND="
cups? (
@@ -88,18 +88,12 @@ src_compile() {
cmake_src_compile
 
if use icons; then
-   # in some cases inkscape tries to write font cache to the
-   # system dir, see bug 739166
-   addpredict /usr/share/inkscape/fonts
-   local inkarg="-e"
-   has_version -b '>media-gfx/inkscape-0.99' && inkarg="-o"
-
sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
cd xpdf-qt
mkdir $sizes
local i
for i in $sizes; do
-   inkscape xpdf-icon.svg -w $i -h $i $inkarg $i/xpdf.png
+   rsvg-convert xpdf-icon.svg -w $i -h $i -o $i/xpdf.png
done
fi
 }

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2020-09-19 Thread Andrew Savchenko

commit: 3f535c7636d53f04ddf69e514f9a2b9e9009ed61
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Sep 19 10:18:32 2020 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Sep 19 10:21:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f535c76

app-text/xpdf: workaround inkscape sandbox violations

Closes: https://bugs.gentoo.org/739166
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.02-r4.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild 
b/app-text/xpdf/xpdf-4.02-r4.ebuild
index 4311f1b32ef..c8a43737864 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -87,6 +87,9 @@ src_compile() {
cmake-utils_src_compile
 
if use icons; then
+   # in some cases inkscape tries to write font cache to the
+   # system dir, see bug 739166
+   addpredict /usr/share/inkscape/fonts
local inkarg="-e"
has_version -b '>media-gfx/inkscape-0.99' && inkarg="-o"

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2020-09-19 Thread Andrew Savchenko

commit: c630935617aa5c55593b0d0497d83610bb5320d9
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Sep 19 15:36:47 2020 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Sep 19 15:40:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6309356

app-text/xpdf: migrate from cmake-utils to cmake eclass

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.02-r4.ebuild | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild 
b/app-text/xpdf/xpdf-4.02-r4.ebuild
index c8a43737864..288d1e75901 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils desktop xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="The PDF viewer and tools"
 HOMEPAGE="https://www.xpdfreader.com";
@@ -65,7 +65,8 @@ src_prepare() {
sed -i "s|/usr/local|${EPREFIX}/usr|" 
"${WORKDIR}"/*/add-to-xpdfrc || die
fi
 
-   cmake-utils_src_prepare
+   xdg_environment_reset
+   cmake_src_prepare
 }
 
 src_configure() {
@@ -80,11 +81,11 @@ src_configure() {
-DXPDFWIDGET_PRINTING=$(usex cups)
-DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_compile() {
-   cmake-utils_src_compile
+   cmake_src_compile
 
if use icons; then
# in some cases inkscape tries to write font cache to the
@@ -104,7 +105,7 @@ src_compile() {
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
 
domenu "${FILESDIR}/xpdf.desktop"
newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2024-07-20 Thread Andrew Savchenko

commit: e391cb02aa7c3eb8e643928175e052ac6f588c28
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jul 20 16:34:52 2024 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Jul 20 16:34:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e391cb02

app-text/xpdf: add myself as a maintainer

Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-text/xpdf/metadata.xml b/app-text/xpdf/metadata.xml
index bd29776a71c3..77412381d44b 100644
--- a/app-text/xpdf/metadata.xml
+++ b/app-text/xpdf/metadata.xml
@@ -1,7 +1,10 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-  
+  
+birc...@gentoo.org
+Andrew Savchenko
+  
   
 Include support for CMYK rasterization
 Enable support non-UTF8 national charsets

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2024-07-20 Thread Andrew Savchenko

commit: 397d93d9ecb352d2e6778222a4a34cc0156b7e99
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jul 20 16:53:20 2024 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Jul 20 16:53:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=397d93d9

app-text/xpdf: remove unused cmake variable

CMAKE_DISABLE_FIND_PACKAGE_Qt4 is never used if either qt6 or qt5 are
found, so it can be safely removed to fix QA warning.

Bug: https://bugs.gentoo.org/917451
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.04-r1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-text/xpdf/xpdf-4.04-r1.ebuild 
b/app-text/xpdf/xpdf-4.04-r1.ebuild
index cf95468f9077..a9265208e02a 100644
--- a/app-text/xpdf/xpdf-4.04-r1.ebuild
+++ b/app-text/xpdf/xpdf-4.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -96,7 +96,6 @@ src_configure() {
# https://forum.xpdfreader.com/viewtopic.php?p=45052#p45052
# Likely fixed in 4.05
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=ON
-   -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON
)
cmake_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2024-07-20 Thread Andrew Savchenko

commit: aff4faa0924988e635cef587083d3cf848808576
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jul 20 16:55:08 2024 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Jul 20 16:55:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aff4faa0

app-text/xpdf: remove unused cmake variable

CMAKE_DISABLE_FIND_PACKAGE_Qt4 is never used if either qt6 or qt5 are
found, so it can be safely removed to fix QA warning.

Closes: https://bugs.gentoo.org/917451
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.04-r2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.04-r2.ebuild 
b/app-text/xpdf/xpdf-4.04-r2.ebuild
index 11c66d17c05a..d6b416ea336a 100644
--- a/app-text/xpdf/xpdf-4.04-r2.ebuild
+++ b/app-text/xpdf/xpdf-4.04-r2.ebuild
@@ -97,7 +97,6 @@ src_configure() {
# https://forum.xpdfreader.com/viewtopic.php?p=45052#p45052
# Likely fixed in 4.05
-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=ON
-   -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON
)
cmake_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2024-07-20 Thread Andrew Savchenko

commit: 8638b4d7b8c48f05bc09f5d3bee812d857269bc1
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jul 20 20:54:01 2024 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Jul 20 21:12:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8638b4d7

app-text/xpdf: update metadata

We're using rsvg-convert instead of inkscape to generate png's now.
Reflect this in the USE=icons flag description.

Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/metadata.xml b/app-text/xpdf/metadata.xml
index 77412381d44b..7c2232eb3027 100644
--- a/app-text/xpdf/metadata.xml
+++ b/app-text/xpdf/metadata.xml
@@ -8,7 +8,7 @@
   
 Include support for CMYK rasterization
 Enable support non-UTF8 national charsets
-Generate desktop PNG icons using 
media-gfx/inkscape
+Generate desktop PNG icons using rsvg-convert from 
gnome-base/librsvg
 Use app-text/libpaper to get paper 
preferences
 Use A4 instead of US Letter paper size by default for 
PostScript output. This option has effect only if libpaper USE flag is 
disabled
 Include support for OPI (Open Prepress Interface) 
comments

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2024-07-20 Thread Sam James

commit: 05b3b6711e04c1e92a4315065f3248b197b20f78
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 20 22:45:48 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 20 22:45:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b3b671

app-text/xpdf: Stabilize 4.04-r2 amd64, #936403

Signed-off-by: Sam James  gentoo.org>

 app-text/xpdf/xpdf-4.04-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.04-r2.ebuild 
b/app-text/xpdf/xpdf-4.04-r2.ebuild
index d6b416ea336a..0192a77395d6 100644
--- a/app-text/xpdf/xpdf-4.04-r2.ebuild
+++ b/app-text/xpdf/xpdf-4.04-r2.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
 
 LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2024-07-20 Thread Sam James

commit: 8f72753fe5fff3bb972c4f824308ebe862a94439
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 21 00:32:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 21 00:32:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f72753f

app-text/xpdf: Stabilize 4.04-r2 x86, #936403

Signed-off-by: Sam James  gentoo.org>

 app-text/xpdf/xpdf-4.04-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.04-r2.ebuild 
b/app-text/xpdf/xpdf-4.04-r2.ebuild
index 0192a77395d6..7b731b386e3f 100644
--- a/app-text/xpdf/xpdf-4.04-r2.ebuild
+++ b/app-text/xpdf/xpdf-4.04-r2.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
 
 LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2024-07-21 Thread Andrew Savchenko

commit: 2dcc6653e8f396807dfe983975520ae0f000c832
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jul 21 19:36:12 2024 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun Jul 21 19:36:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dcc6653

app-text/xpdf: drop 4.04-r1

Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.04-r1.ebuild | 161 --
 1 file changed, 161 deletions(-)

diff --git a/app-text/xpdf/xpdf-4.04-r1.ebuild 
b/app-text/xpdf/xpdf-4.04-r1.ebuild
deleted file mode 100644
index a9265208e02a..
--- a/app-text/xpdf/xpdf-4.04-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/xpdf.asc
-inherit cmake desktop verify-sig xdg
-
-DESCRIPTION="The PDF viewer and tools"
-HOMEPAGE="https://www.xpdfreader.com";
-SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
-   i18n? (
-   https://dl.xpdfreader.com/xpdf-arabic.tar.gz
-   https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> 
xpdf-chinese-simplified-20201222.tar.gz
-   https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> 
xpdf-chinese-traditional-20201222.tar.gz
-   https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
-   https://dl.xpdfreader.com/xpdf-greek.tar.gz
-   https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
-   https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> 
xpdf-japanese-20201222.tar.gz
-   https://dl.xpdfreader.com/xpdf-korean.tar.gz -> 
xpdf-korean-20201222.tar.gz
-   https://dl.xpdfreader.com/xpdf-latin2.tar.gz
-   https://dl.xpdfreader.com/xpdf-thai.tar.gz
-   https://dl.xpdfreader.com/xpdf-turkish.tar.gz
-   )
-   verify-sig? ( https://dl.xpdfreader.com/${P}.tar.gz.sig )"
-
-LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
-
-BDEPEND="
-   icons? ( gnome-base/librsvg )
-   verify-sig? ( sec-keys/openpgp-keys-xpdf )
-"
-DEPEND="
-   cups? (
-   dev-qt/qtprintsupport:5[cups]
-   net-print/cups
-   )
-   fontconfig? ( media-libs/fontconfig )
-   libpaper? ( app-text/libpaper:= )
-   utils? ( png? ( media-libs/libpng:0 ) )
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5
-   media-libs/freetype
-   sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-   dev-qt/qtsvg:5
-   media-fonts/urw-fonts
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-automagic.patch
-   "${FILESDIR}"/${PN}-visibility.patch
-   "${FILESDIR}"/${PN}-shared-libs.patch
-   "${FILESDIR}"/${PN}-4.04-libpaper-2.patch
-)
-
-DOCS=( ANNOUNCE CHANGES README )
-
-src_unpack() {
-   if use verify-sig; then
-   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig}
-   fi
-   default
-}
-
-src_prepare() {
-   sed -i \
-   "s|/usr/local/etc|${EPREFIX}/etc|;
-s|/usr/local|${EPREFIX}/usr|" \
-   doc/sample-xpdfrc || die
-
-   if use i18n; then
-   sed -i "s|/usr/local|${EPREFIX}/usr|" 
"${WORKDIR}"/*/add-to-xpdfrc || die
-   fi
-
-   xdg_environment_reset
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DA4_PAPER=$(usex metric)
-   -DNO_FONTCONFIG=$(usex fontconfig off on)
-   -DNO_TEXT_SELECT=$(usex textselect off on)
-   -DOPI_SUPPORT=$(usex opi)
-   -DSPLASH_CMYK=$(usex cmyk)
-   -DWITH_LIBPAPER=$(usex libpaper)
-   -DWITH_LIBPNG=$(usex png)
-   -DXPDFWIDGET_PRINTING=$(usex cups)
-   -DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
-   # Bug 910166
-   # https://forum.xpdfreader.com/viewtopic.php?p=45052#p45052
-   # Likely fixed in 4.05
-   -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=ON
-   )
-   cmake_src_configure
-}
-
-src_compile() {
-   cmake_src_compile
-
-   if use icons; then
-   sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
-   cd xpdf-qt
-   mkdir $sizes
-   local i
-   for i in $sizes; do
-   rsvg-convert xpdf-icon.svg -w $i -h $i -o $i/xpdf.png
-   done
-   fi
-}
-
-src_install() {
-   cmake_src_install
-
-   domenu "${FILESDIR}/xpdf.desktop"
-   newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
-   if use icons; then
-   local i
-   for i in $sizes; do
-   doicon -s $i xpdf-qt/$i/xpdf.png
-   done
-   unset sizes
-   fi
-
-   insinto /etc
-   newins doc/sample-xpdfrc xpdfrc
-
-   local d i
-

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2022-07-03 Thread Agostino Sarubbo

commit: d2c029c15ce5a784f73e93fa680894645b02a858
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jul  3 10:46:23 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jul  3 10:48:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c029c1

app-text/xpdf: amd64 stable wrt bug #856010

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-text/xpdf/xpdf-4.04.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.04.ebuild b/app-text/xpdf/xpdf-4.04.ebuild
index aaedc7d90ef4..e7e7fa99cd03 100644
--- a/app-text/xpdf/xpdf-4.04.ebuild
+++ b/app-text/xpdf/xpdf-4.04.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
 
 LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2022-07-03 Thread Agostino Sarubbo

commit: 81b9462059c17a92cff396d52bcd1f5f779a20fd
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jul  3 10:51:57 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jul  3 10:51:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81b94620

app-text/xpdf: x86 stable wrt bug #856010

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-text/xpdf/xpdf-4.04.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.04.ebuild b/app-text/xpdf/xpdf-4.04.ebuild
index e7e7fa99cd03..f5fa12f939ab 100644
--- a/app-text/xpdf/xpdf-4.04.ebuild
+++ b/app-text/xpdf/xpdf-4.04.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
 
 LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2022-07-26 Thread Andrew Savchenko

commit: 9acdf0acbed78a5c950374c190da2ccdfa640c5f
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Tue Jul 26 10:38:55 2022 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Tue Jul 26 15:00:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9acdf0ac

app-text/xpdf: drop 4.03

Bug: https://bugs.gentoo.org/840873
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/Manifest |   1 -
 app-text/xpdf/xpdf-4.03.ebuild | 146 -
 2 files changed, 147 deletions(-)

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 46bf6536f101..5f89e2aa56cf 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,4 +1,3 @@
-DIST xpdf-4.03.tar.gz 936046 BLAKE2B 
bd0198ec6be627edce6386f0d93b0921906b2c5f79b3eb02f89719e64cbe3ca3b2df53db8aecc6df3581eb022ca0d4c209a880760e5bbb3eb46b40b106d6d144
 SHA512 
5f8478c2c4863a3c50f9b45a6fec73c7e67a74adbeaa651dd2e29982ea4cf050740874ee670672f985a323c12c28c968c16238c4238aeb52810a45e2728d622f
 DIST xpdf-4.04.tar.gz 969535 BLAKE2B 
981f791c098b4632dd65ad581c0284beb730ebe1935dbe942882aa63fb23920eb241334e946ba9be07b5bc1b0c73effcccb2c8b2c95182a06d35a745862926a8
 SHA512 
a26b67a4b3d5a5a365153845bf72d77949e683ce26aaf4705b49194cb32bbc581617c3e9c37f74bf6c49480df06d49e8c38d41233966b6215eacf92591d4d9bf
 DIST xpdf-4.04.tar.gz.sig 801 BLAKE2B 
2f2b5c6a70ae007165afd3ec78c2fe168a380f6960176cc6c655a235aa83c1f7e608c5fd82cbce0b0877a92e3dea76950db450b96527eb14813ddcab2125a3ab
 SHA512 
4c2740cf6a659e896584339a1238089465a548547c829f047d0313e46f6e3bba6c404ff37df7baf2f5d0c317d6ec954167f31bb1501a65e638b2617c6730d925
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 
5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab
 SHA512 
1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e

diff --git a/app-text/xpdf/xpdf-4.03.ebuild b/app-text/xpdf/xpdf-4.03.ebuild
deleted file mode 100644
index c9761c8e26b8..
--- a/app-text/xpdf/xpdf-4.03.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="The PDF viewer and tools"
-HOMEPAGE="https://www.xpdfreader.com";
-SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
-   i18n? (
-   https://dl.xpdfreader.com/xpdf-arabic.tar.gz
-   https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> 
xpdf-chinese-simplified-20201222.tar.gz
-   https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> 
xpdf-chinese-traditional-20201222.tar.gz
-   https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
-   https://dl.xpdfreader.com/xpdf-greek.tar.gz
-   https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
-   https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> 
xpdf-japanese-20201222.tar.gz
-   https://dl.xpdfreader.com/xpdf-korean.tar.gz -> 
xpdf-korean-20201222.tar.gz
-   https://dl.xpdfreader.com/xpdf-latin2.tar.gz
-   https://dl.xpdfreader.com/xpdf-thai.tar.gz
-   https://dl.xpdfreader.com/xpdf-turkish.tar.gz
-   )"
-
-LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
-
-BDEPEND="
-   icons? ( gnome-base/librsvg )
-"
-DEPEND="
-   cups? (
-   dev-qt/qtprintsupport:5[cups]
-   net-print/cups
-   )
-   fontconfig? ( media-libs/fontconfig )
-   libpaper? ( app-text/libpaper )
-   utils? ( png? ( media-libs/libpng:0 ) )
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5
-   media-libs/freetype
-   sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-   dev-qt/qtsvg:5
-   media-fonts/urw-fonts
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-automagic.patch
-   "${FILESDIR}"/${PN}-visibility.patch
-   "${FILESDIR}"/${PN}-shared-libs.patch
-)
-
-DOCS=( ANNOUNCE CHANGES README )
-
-src_prepare() {
-   sed -i \
-   "s|/usr/local/etc|${EPREFIX}/etc|;
-s|/usr/local|${EPREFIX}/usr|" \
-   doc/sample-xpdfrc || die
-
-   if use i18n; then
-   sed -i "s|/usr/local|${EPREFIX}/usr|" 
"${WORKDIR}"/*/add-to-xpdfrc || die
-   fi
-
-   xdg_environment_reset
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DA4_PAPER=$(usex metric)
-   -DNO_FONTCONFIG=$(usex fontconfig off on)
-   -DNO_TEXT_SELECT=$(usex textselect off on)
-   -DOPI_SUPPORT=$(usex opi)
-   -DSPLASH_CMYK=$(usex cmyk)
-   -DWITH_LIBPAPER=$(usex libpaper)
-   -DWITH_LIBPNG=$(usex png)
-   -DXPDFWIDGET_PRINTING=$(usex cups)
-   -DSYSTEM_XPDFRC="${EPR

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2022-07-26 Thread Andrew Savchenko

commit: 4fd6556ce28bba04aafb277a2023677541ba2a10
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Tue Jul 26 15:26:33 2022 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Tue Jul 26 15:32:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd6556c

app-text/xpdf: check singnature only for the source tarball

Upstream provides GPG signature for the source tarball, but not for i18n
charset tarballs. So manual verification of the source tarball is
required instead of default verify-all action.

Closes: https://bugs.gentoo.org/857258
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/xpdf-4.04.ebuild | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/app-text/xpdf/xpdf-4.04.ebuild b/app-text/xpdf/xpdf-4.04.ebuild
index f5fa12f939ab..682bfe8d9f78 100644
--- a/app-text/xpdf/xpdf-4.04.ebuild
+++ b/app-text/xpdf/xpdf-4.04.ebuild
@@ -59,6 +59,13 @@ PATCHES=(
 
 DOCS=( ANNOUNCE CHANGES README )
 
+src_unpack() {
+   if use verify-sig; then
+   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig}
+   fi
+   default
+}
+
 src_prepare() {
sed -i \
"s|/usr/local/etc|${EPREFIX}/etc|;

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2024-08-20 Thread Sam James

commit: 50964b418f5e6529bac293b9c54b06f5796410ef
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 20 18:04:43 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 20 18:04:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50964b41

app-text/xpdf: Stabilize 4.05 x86, #938251

Signed-off-by: Sam James  gentoo.org>

 app-text/xpdf/xpdf-4.05.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.05.ebuild b/app-text/xpdf/xpdf-4.05.ebuild
index 74678b63195a..8e06469e7d3a 100644
--- a/app-text/xpdf/xpdf-4.05.ebuild
+++ b/app-text/xpdf/xpdf-4.05.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
 
 LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils qt6"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2024-08-20 Thread Sam James

commit: 90b3cf17341ba3bf83e90aed5ba59b51617583c1
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 20 18:04:45 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 20 18:04:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90b3cf17

app-text/xpdf: Stabilize 4.05 amd64, #938251

Signed-off-by: Sam James  gentoo.org>

 app-text/xpdf/xpdf-4.05.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.05.ebuild b/app-text/xpdf/xpdf-4.05.ebuild
index 8e06469e7d3a..a6b60faa0c1a 100644
--- a/app-text/xpdf/xpdf-4.05.ebuild
+++ b/app-text/xpdf/xpdf-4.05.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
 
 LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils qt6"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2022-09-15 Thread Sam James

commit: e5a960cadf9fdeda3ea5f56829a2996a04e6005c
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 15 13:18:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 15 13:18:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5a960ca

app-text/xpdf: add libpaper slot dep

ABI broke.

Signed-off-by: Sam James  gentoo.org>

 app-text/xpdf/{xpdf-4.04.ebuild => xpdf-4.04-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/xpdf/xpdf-4.04.ebuild b/app-text/xpdf/xpdf-4.04-r1.ebuild
similarity index 99%
rename from app-text/xpdf/xpdf-4.04.ebuild
rename to app-text/xpdf/xpdf-4.04-r1.ebuild
index 682bfe8d9f78..9d39323e7d04 100644
--- a/app-text/xpdf/xpdf-4.04.ebuild
+++ b/app-text/xpdf/xpdf-4.04-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="
net-print/cups
)
fontconfig? ( media-libs/fontconfig )
-   libpaper? ( app-text/libpaper )
+   libpaper? ( app-text/libpaper:= )
utils? ( png? ( media-libs/libpng:0 ) )
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/

2023-11-16 Thread Florian Schmaus

commit: e00f435d7b1c02f16d6f5e1e897801e2c29e77aa
Author: Paul Zander  gmail  com>
AuthorDate: Wed Nov  1 12:44:05 2023 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Thu Nov 16 15:10:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00f435d

app-text/xpdf: fix build with installed Qt6

Closes: https://bugs.gentoo.org/910166

Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33618
Signed-off-by: Florian Schmaus  gentoo.org>

 app-text/xpdf/xpdf-4.04-r1.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/app-text/xpdf/xpdf-4.04-r1.ebuild 
b/app-text/xpdf/xpdf-4.04-r1.ebuild
index 512df3d45bb8..cf95468f9077 100644
--- a/app-text/xpdf/xpdf-4.04-r1.ebuild
+++ b/app-text/xpdf/xpdf-4.04-r1.ebuild
@@ -92,6 +92,11 @@ src_configure() {
-DWITH_LIBPNG=$(usex png)
-DXPDFWIDGET_PRINTING=$(usex cups)
-DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
+   # Bug 910166
+   # https://forum.xpdfreader.com/viewtopic.php?p=45052#p45052
+   # Likely fixed in 4.05
+   -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=ON
+   -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON
)
cmake_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/, app-text/xpdf/files/

2019-03-11 Thread Andrew Savchenko

commit: bb4f79138a75abb85109b342c215b93c448ee153
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Tue Mar 12 06:47:32 2019 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Tue Mar 12 06:48:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb4f7913

app-text/xpdf: re-add to the tree

Xpdf is back on track again with modern interface and active
development :)

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/Manifest |  12 +++
 app-text/xpdf/files/xpdf-automagic.patch   |  36 +
 app-text/xpdf/files/xpdf-shared-libs.patch |  54 ++
 app-text/xpdf/files/xpdf-visibility.patch  |  11 +++
 app-text/xpdf/metadata.xml |  17 +
 app-text/xpdf/xpdf-4.0.1.ebuild| 116 +
 6 files changed, 246 insertions(+)

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
new file mode 100644
index 000..997f9a14c51
--- /dev/null
+++ b/app-text/xpdf/Manifest
@@ -0,0 +1,12 @@
+DIST xpdf-4.01.tar.gz 891150 BLAKE2B 
6280bf9d4c17894a22e63d3fdbe3c67679657121196f84964c1353cb2f09348c38de327f7a6259831afb2ff748340c94196eec11b24a442c6e76dbc170d62ac7
 SHA512 
327d8bcf1f30a0fdbbdc33e2262d4e7de44f28a0f42cc87bbee6b2a8059d8cca8ffa715f7e810f9b53deb690bf9744ae5e8cf86a101941b8103100ded89e36e6
+DIST xpdf-arabic.tar.gz 1057 BLAKE2B 
5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab
 SHA512 
1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
+DIST xpdf-chinese-simplified.tar.gz 918277 BLAKE2B 
ad41cc6ceae8d5295e49e6cb6356885a77dd314fd55cae95f4adf7ca597c7d86c0029b2767b1ecae86883d31cf9acc5d67997e1ab7871f10d2b6550734bb3b34
 SHA512 
1f016ff06301cf445546b380fe4cf0c1c9ef08b5e37bd392ca975b4a54fa43afbe251c31e14f216c68fb38dcf04f40ab5baf828586734efb7881a755f92cc49e
+DIST xpdf-chinese-traditional.tar.gz 906297 BLAKE2B 
63f4e482b0ba127331ae9adaa69a64ac868e5973d631cec57867ccab83566b61c37771be28c42d02994f574e7bf0fe16813d2d18d6ef5869dc1200f702d7c6dc
 SHA512 
6fec238af3c76f149087bb4445786cb1de31fbcb17982b8da779e71a91e76c780dde7970515eaa6131db2e654d04d13aebe8d840203293b9072850c5d1e6ba0b
+DIST xpdf-cyrillic.tar.gz 1656 BLAKE2B 
454b9a276106d61481fdb8da934ac0de50b86a99d882e27bc9e1cf09a03ae2156909df405de78413e0ac3b529af479b2fbdf5978cc1022cee25c50df6ef21f0e
 SHA512 
ab1197c90f8cd3d8664ebbdc7ecefdfb8ec12e24da2f7616cad1d5bc9c7fd172c48db6a18d76172de8342377acc8e1dcd78bcf0fb1ef9f05cf94729e90586827
+DIST xpdf-greek.tar.gz 1259 BLAKE2B 
f9f695b55c48ee2956ccab1ba9c7ae5bcb2df0669efcb8e111c6100f957238ae73b18589e40dece8b0c38212f00a52c1dc381cc5efcca7c97fe261d72470bb6f
 SHA512 
2e0e281e09e1abc2f0e40b6787703538d52cb62edcd4c4156698700a5f908afee290c62ad9a6ff4ea74bc42e0a8fe9a7765a212efbc223512d4bb442448ea52f
+DIST xpdf-hebrew.tar.gz 1317 BLAKE2B 
bfd5bddc250c1ae1e01fe68f1a4caa649d2a443d3c39565b5209d07f32d46e3474e6823f243b08ab6088e4686cb79e58fce5c9a3de271a77c6b1713fa58b1000
 SHA512 
0ebe652f8633151d13ef2403bd293682b511ab86c1391ce187f1fc0274f33bd9c7e6ec682c8f79ac4fd27c74ab81ad2ae334a75f26001092521cff9a73cd0b8a
+DIST xpdf-japanese.tar.gz 1011166 BLAKE2B 
67c2e8045214462737aa2332aa6ddba35581866e22bece5c166aa3fa808da0dddae11b7e9bcfe50f00087b74f1e7694ac8e407268cdefcab1fe60163eb3bdf70
 SHA512 
0d7b6e4c31caae1ec49d43f108d2dacc76fa84b79e9794d2d0071f33d7fadfacd533f0da1d5bcac3ec1c0757dbd6be4279acac1d148620e1d89d7a9af0966a08
+DIST xpdf-korean.tar.gz 526847 BLAKE2B 
e1640f6df0bc1e126b2e0f010403fc3ff068a8171d31cc616dfaff43170acfa69ff5dc0ac732d346d6aa9b2b21549b21e11f98f5038050b5075ee7fff8a93444
 SHA512 
871a9de0e40d7ef9fb42bb2d90558875f5b84962d7f811d5a18f4b68fadbe7c34e2c18c660a160c9ed9539adc22684985f296c77af2ed3bf604d9989bdcb3d1d
+DIST xpdf-latin2.tar.gz 1431 BLAKE2B 
db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f3595601f6e9f31a3fba9bc0d35f28e0016
 SHA512 
5fe0b60bfac7f0f4a26e3e7216de5043f6b94446f464c984b7c25431ec01a5912952c0dc66bb2c7159c9f63e4805689c6cfc761086aad9e59f1f21d0cddb5d15
+DIST xpdf-thai.tar.gz 1878 BLAKE2B 
dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9
 SHA512 
5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
+DIST xpdf-turkish.tar.gz 1137 BLAKE2B 
f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c
 SHA512 
a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1

diff --git a/app-text/xpdf/files/xpdf-automagic.patch 
b/app-text/xpdf/files/xpdf-automagic.patch
new file mode 100644
index 000..4c35ca8916f
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-automagic.

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/, app-text/xpdf/files/

2020-03-01 Thread Andrew Savchenko

commit: 6ab1a068d867bd08ed5377a7b5a8d9e3ec046b18
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Mar  1 20:03:46 2020 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun Mar  1 20:06:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab1a068

app-text/xpdf: fix CVE-2019-17064

Fix NULL pointer dereference by initializing field before use.
https://forum.xpdfreader.com/viewtopic.php?f=3&t=41890#p42672

Bug: https://bugs.gentoo.org/711146
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/files/xpdf-CVE-2019-17064.patch |  24 +
 app-text/xpdf/xpdf-4.02-r2.ebuild | 141 ++
 2 files changed, 165 insertions(+)

diff --git a/app-text/xpdf/files/xpdf-CVE-2019-17064.patch 
b/app-text/xpdf/files/xpdf-CVE-2019-17064.patch
new file mode 100644
index 000..c4f84a4604c
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-CVE-2019-17064.patch
@@ -0,0 +1,24 @@
+Fix CVE-2019-17064
+
+Fix NULL pointer dereference by initializing field before use.
+https://forum.xpdfreader.com/viewtopic.php?f=3&t=41890#p42672
+
+diff '--color=auto' -Naurd xpdf-4.02.orig/xpdf/Catalog.cc 
xpdf-4.02/xpdf/Catalog.cc
+--- xpdf-4.02.orig/xpdf/Catalog.cc 2019-09-25 22:54:33.0 +0300
 xpdf-4.02/xpdf/Catalog.cc  2020-03-01 12:05:43.235486706 +0300
+@@ -159,6 +159,7 @@
+   baseURI = NULL;
+   form = NULL;
+   embeddedFiles = NULL;
++  pageLabels = NULL;
+ #if MULTITHREADED
+   gInitMutex(&pageMutex);
+ #endif
+@@ -241,7 +242,6 @@
+   // get the ViewerPreferences object
+   catDict.dictLookupNF("ViewerPreferences", &viewerPrefs);
+ 
+-  pageLabels = NULL;
+   if (catDict.dictLookup("PageLabels", &obj)->isDict()) {
+ readPageLabelTree(&obj);
+   }

diff --git a/app-text/xpdf/xpdf-4.02-r2.ebuild 
b/app-text/xpdf/xpdf-4.02-r2.ebuild
new file mode 100644
index 000..96d625e1826
--- /dev/null
+++ b/app-text/xpdf/xpdf-4.02-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop xdg
+
+DESCRIPTION="The PDF viewer and tools"
+HOMEPAGE="https://www.xpdfreader.com";
+SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
+   i18n? (
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
+   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
+   
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
+   https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
+   )"
+
+LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmyk cups i18n icons +libpaper metric opi png +textselect utils"
+
+BDEPEND="
+   icons? ( media-gfx/inkscape )
+"
+DEPEND="
+   cups? (
+   dev-qt/qtprintsupport:5
+   net-print/cups
+   )
+   libpaper? ( app-text/libpaper )
+   utils? ( png? ( media-libs/libpng:0 ) )
+   dev-qt/qtnetwork:5
+   dev-qt/qtwidgets:5
+   media-libs/freetype
+   sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+   media-fonts/urw-fonts
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-automagic.patch
+   "${FILESDIR}"/${PN}-visibility.patch
+   "${FILESDIR}"/${PN}-shared-libs.patch
+   "${FILESDIR}"/${PN}-CVE-2019-17064.patch
+)
+
+src_prepare() {
+   sed -i \
+   "s|/usr/local/etc|${EPREFIX}/etc|;
+s|/usr/local|${EPREFIX}/usr|" \
+   doc/sample-xpdfrc || die
+
+   if use i18n; then
+   sed -i "s|/usr/local|${EPREFIX}/usr|" 
"${WORKDIR}"/*/add-to-xpdfrc || die
+   fi
+
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DA4_PAPER=$(usex metric)
+   -DNO_TEXT_SELECT=$(usex textselect off on)
+   -DOPI_SUPPORT=$(usex opi)
+   -DSPLASH_CMYK=$(usex cmyk)
+   -DWITH_LIBPAPER=$(usex libpaper)
+   -DWITH_LIBPNG=$(usex png)
+   -DXPDFWIDGET_PRINTING=$(usex cups)
+   -DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
+   )
+   cmake-utils_src_configure
+}
+
+src_compile() {
+   cmake-utils_src_compile
+
+   if use icons; then
+   sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
+   cd xpdf-qt
+   mkdir $sizes
+   local i
+   for i

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/files/, app-text/xpdf/

2020-01-18 Thread Andrew Savchenko

commit: c0532994d83390f3ef3964cea43edab9be194057
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jan 18 18:23:23 2020 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Jan 18 18:26:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0532994

app-text/xpdf: Add desktop files and icons

Also add USE=icons to generate PNG icon files since not all DE/WMs
can work with SVG.

Closes: https://bugs.gentoo.org/705344
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/files/xpdf.desktop  | 104 
 app-text/xpdf/metadata.xml|   1 +
 app-text/xpdf/xpdf-4.02-r1.ebuild | 140 ++
 3 files changed, 245 insertions(+)

diff --git a/app-text/xpdf/files/xpdf.desktop b/app-text/xpdf/files/xpdf.desktop
new file mode 100644
index 000..d22edbe76d9
--- /dev/null
+++ b/app-text/xpdf/files/xpdf.desktop
@@ -0,0 +1,104 @@
+[Desktop Entry]
+Name=XPDF
+Name[bn]=এক্স পি-ডি-এফ
+Name[de]=X-PDF
+Name[eo]=XPDF
+Name[es]=PDF para X
+Name[fr]=XPDF
+Name[hi]=एक्स पीडीएफ
+Name[ko]=X용 PDF
+Name[mn]=X-PDF
+Name[nds]=X-PDF
+Name[te]=ఎక్స్ పిడిఎఫ్
+Comment=PDF Viewer
+Comment[af]=Pdf Aansig
+Comment[ar]=عارض الملفات PDF
+Comment[az]=PDF Nümayişçisi
+Comment[be]=Праглядальнік PDF
+Comment[bg]=Преглед на PDF документи
+Comment[bn]=পি-ডি-এফ প্রদর্শক
+Comment[br]=Gweler PDF
+Comment[bs]=Preglednik PDF dokumenata
+Comment[ca]=Visor PDF
+Comment[cs]=Prohlížeč PDF souborů
+Comment[csb]=Przezérnik PDF
+Comment[cy]=Gwelydd PDF
+Comment[da]=PDF-fremviser
+Comment[de]=PDF-Betrachter
+Comment[el]=Προβολέας PDF
+Comment[eo]=PDF-rigardilo
+Comment[es]=Visor de documentos PDF
+Comment[et]=PDF failide vaatamine
+Comment[eu]=PDF ikustailua
+Comment[fa]=مشاهده‌گر PDF
+Comment[fi]=PDF-näytin
+Comment[fo]=PDF-vísari
+Comment[fr]=Afficheur PDF
+Comment[fy]=PDF-werjefteprogramma
+Comment[ga]=Amharcán PDF
+Comment[gl]=Visualizador de PDF
+Comment[he]=מציג קבצי PDF
+Comment[hi]=पीडीएफ प्रदर्शक
+Comment[hr]=Preglednik PDF dokumenata
+Comment[hu]=PDF-nézegető
+Comment[id]=Viewer PDF
+Comment[is]=PDF-sjá
+Comment[it]=Visualizzatore PDF
+Comment[ja]=PDF ビューア
+Comment[kk]=PDF қарау құралы
+Comment[km]=កម្មវិធីមើល PDF
+Comment[ko]=PDF 보기
+Comment[lo]=ສະແດງຜົນPDF
+Comment[lt]=PDF Žiūriklis
+Comment[lv]=PDF Skatītājs
+Comment[mk]=Прегледувач на PDF
+Comment[mn]=PDF-Харагч
+Comment[ms]=Pemapar PDF
+Comment[mt]=Werrej PDF
+Comment[nb]=PDF-leser
+Comment[nds]=Kieker för PDF-Dateien
+Comment[ne]=PDF दर्शक
+Comment[nl]=PDF-weergaveprogramma
+Comment[nn]=PDF-lesar
+Comment[nso]=Molebeledi wa PDF
+Comment[oc]=Visualisor PDF
+Comment[pa]=PDF ਦਰਸ਼ਕ
+Comment[pl]=Przeglądarka plików PDF
+Comment[pt]=Visualizador de PDFs
+Comment[pt_BR]=Visualizador de arquivos PDF
+Comment[ro]=Vizualizor de documente PDF
+Comment[ru]=Просмотр PDF
+Comment[rw]=Mugaragaza PDF
+Comment[se]=PDF-logan
+Comment[sk]=Prehliadač PDF súborov
+Comment[sl]=Pregledovalnik datotek PDF
+Comment[sr]=PDF приказивач
+Comment[sr@Latn]=PDF prikazivač
+Comment[ss]=Sibuki se PDF 
+Comment[sv]=PDF-visare
+Comment[ta]=PDF காட்சி
+Comment[tg]=Намоишгари PDF
+Comment[th]=ตัวแสดงผล PDF
+Comment[tr]=PDF Görüntüleyici
+Comment[tt]=PDF Kürsätkeç
+Comment[uk]=Переглядач PDF
+Comment[uz]=PDF кўрувчи
+Comment[ven]=Tshivhoni tsha PDF
+Comment[vi]=Trình xem PDF
+Comment[wa]=Håyneu di documints PDF
+Comment[zh_CN]=PDF 查看器
+Comment[zh_TW]=PDF 檢視程式
+Comment[zu]=Umbukisi we-PDF
+Keywords=pdf;document;presentation;viewer;
+Keywords[de]=pdf;Dokument;Präsentation;Betrachter;
+Keywords[ru]=pdf;документ;презентация;просмотр;
+Keywords[uk]=pdf;документ;презентація;перегляд;
+Keywords[ja]=pdf;ドキュメント;プレゼンテーション;ビューアー;
+
+Exec=xpdf
+Icon=xpdf
+Type=Application
+Terminal=false
+StartupNotify=false
+MimeType=application/pdf;
+Categories=Office;Viewer;Graphics;2DGraphics;VectorGraphics;

diff --git a/app-text/xpdf/metadata.xml b/app-text/xpdf/metadata.xml
index aab31e840b1..89d3f9dff56 100644
--- a/app-text/xpdf/metadata.xml
+++ b/app-text/xpdf/metadata.xml
@@ -8,6 +8,7 @@
   
 Include support for CMYK rasterization
 Enable support non-UTF8 national charsets
+Generate desktop PNG icons using 
media-gfx/inkscape
 Use app-text/libpaper to get paper 
preferences
 Use A4 instead of US Letter paper size by default for 
PostScript output. This option has effect only if libpaper USE flag is 
disabled
 Include support for OPI (Open Prepress Interface) 
comments

diff --git a/app-text/xpdf/xpdf-4.02-r1.ebuild 
b/app-text/xpdf/xpdf-4.02-r1.ebuild
new file mode 100644
index 000..e6444660970
--- /dev/null
+++ b/app-text/xpdf/xpdf-4.02-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop xdg
+
+DESCRIPTION="The PDF viewer and tools"
+HOMEPAGE="https://www.xpdfreader.com";
+SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/files/, app-text/xpdf/

2021-02-14 Thread Andrew Savchenko

commit: 8db9d6432f54c3bea1b4d30e9cecd5eea18d1aed
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Feb 14 13:27:36 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun Feb 14 14:45:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db9d643

app-text/xpdf: remove old

Bug: https://bugs.gentoo.org/755938
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/Manifest|   1 -
 app-text/xpdf/files/xpdf-CVE-2019-17064.patch |  24 -
 app-text/xpdf/xpdf-4.02-r4.ebuild | 145 --
 3 files changed, 170 deletions(-)

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 075768e2b3a..af00a43fdca 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,4 +1,3 @@
-DIST xpdf-4.02.tar.gz 912885 BLAKE2B 
70dec3d213566c1a7c13edd05e4f6145b45ad4c4805843393e0f86a07820511a5187cd61a04adf3c3fc671840acdb3b1bbb19dda7dc101df75e564971f51b76f
 SHA512 
72c9413fc7241dde5288137ca8a68c837d2a68e95e909dbe2afe8f374b5a7c92af4edf82918963d1c6388c947057fcf5f0ae1e6fbb2b31c3d5eb9a07d3c74ddc
 DIST xpdf-4.03.tar.gz 936046 BLAKE2B 
bd0198ec6be627edce6386f0d93b0921906b2c5f79b3eb02f89719e64cbe3ca3b2df53db8aecc6df3581eb022ca0d4c209a880760e5bbb3eb46b40b106d6d144
 SHA512 
5f8478c2c4863a3c50f9b45a6fec73c7e67a74adbeaa651dd2e29982ea4cf050740874ee670672f985a323c12c28c968c16238c4238aeb52810a45e2728d622f
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 
5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab
 SHA512 
1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
 DIST xpdf-chinese-simplified-20201222.tar.gz 912967 BLAKE2B 
74eb8da7642147cc6a0d5ee92379823786a78d0dccbdc1d4eab46094d15009bbe72599152b5001c58e7a88bfbb2f7af515e3582e293367a5b0a12bb1c017e8e1
 SHA512 
91c80dc4173a7b40267af1c95708f24557fb56ffc72cbaf48e9adcb0fc310b1bb40f327a8f36b3c6024317e98a44a8ab04d99f6f7b1ea81e775686534f0251ef

diff --git a/app-text/xpdf/files/xpdf-CVE-2019-17064.patch 
b/app-text/xpdf/files/xpdf-CVE-2019-17064.patch
deleted file mode 100644
index c4f84a4604c..000
--- a/app-text/xpdf/files/xpdf-CVE-2019-17064.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix CVE-2019-17064
-
-Fix NULL pointer dereference by initializing field before use.
-https://forum.xpdfreader.com/viewtopic.php?f=3&t=41890#p42672
-
-diff '--color=auto' -Naurd xpdf-4.02.orig/xpdf/Catalog.cc 
xpdf-4.02/xpdf/Catalog.cc
 xpdf-4.02.orig/xpdf/Catalog.cc 2019-09-25 22:54:33.0 +0300
-+++ xpdf-4.02/xpdf/Catalog.cc  2020-03-01 12:05:43.235486706 +0300
-@@ -159,6 +159,7 @@
-   baseURI = NULL;
-   form = NULL;
-   embeddedFiles = NULL;
-+  pageLabels = NULL;
- #if MULTITHREADED
-   gInitMutex(&pageMutex);
- #endif
-@@ -241,7 +242,6 @@
-   // get the ViewerPreferences object
-   catDict.dictLookupNF("ViewerPreferences", &viewerPrefs);
- 
--  pageLabels = NULL;
-   if (catDict.dictLookup("PageLabels", &obj)->isDict()) {
- readPageLabelTree(&obj);
-   }

diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild 
b/app-text/xpdf/xpdf-4.02-r4.ebuild
deleted file mode 100644
index 00c9ecd9388..000
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg
-
-DESCRIPTION="The PDF viewer and tools"
-HOMEPAGE="https://www.xpdfreader.com";
-SRC_URI="https://dl.xpdfreader.com/old/${P}.tar.gz
-   i18n? (
-   https://dl.xpdfreader.com/xpdf-arabic.tar.gz
-   https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> 
xpdf-chinese-simplified-20201222.tar.gz
-   https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> 
xpdf-chinese-traditional-20201222.tar.gz
-   https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
-   https://dl.xpdfreader.com/xpdf-greek.tar.gz
-   https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
-   https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> 
xpdf-japanese-20201222.tar.gz
-   https://dl.xpdfreader.com/xpdf-korean.tar.gz -> 
xpdf-korean-20201222.tar.gz
-   https://dl.xpdfreader.com/xpdf-latin2.tar.gz
-   https://dl.xpdfreader.com/xpdf-thai.tar.gz
-   https://dl.xpdfreader.com/xpdf-turkish.tar.gz
-   )"
-
-LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect 
utils"
-
-BDEPEND="
-   icons? ( gnome-base/librsvg )
-"
-DEPEND="
-   cups? (
-   dev-qt/qtprintsupport:5[cups]
-   net-print/cups
-   )
-   fontconfig? ( media-libs/fontconfig )
-   libpaper? ( app-text/libpaper )
-   utils? ( png? ( media-libs/libpng:0 ) )
-   dev-qt/qtne

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/files/, app-text/xpdf/

2024-07-20 Thread Andrew Savchenko

commit: 47a254308b64f4462a3cdcc7ce49655b41b7bdb5
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Jul 20 21:04:06 2024 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Jul 20 21:12:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47a25430

app-text/xpdf: add 4.05

* Add qt6 support per bug 925519, use updated font-paths patch from
Andrii Batyiev.

* Update simplified Chinese and Korean language support packages.

* Fix the following CVEs:
  - CVE-2018-7453 PDF object loop in AcroForm::scanField
  - CVE-2018-16369 PDF object loop in AcroForm::scanField
  - CVE-2019-9587 PDF object loop in Catalog::countPageTree
  - CVE-2019-9588 PDF object loop in Catalog::countPageTree
  - CVE-2019-16088 PDF object loop in Catalog::countPageTree
  - CVE-2022-30524 logic bug in text extractor led to invalid memory access
  - CVE-2022-30775 integer overflow in rasterizer
  - CVE-2022-33108 PDF object loop in Catalog::countPageTree
  - CVE-2022-36561 PDF object loop in AcroForm::scanField
  - CVE-2022-38222 logic bug in JBIG2 decoder
  - CVE-2022-38334 PDF object loop in Catalog::countPageTree
  - CVE-2022-38928 missing bounds check in CFF font converter caused null
   pointer dereference
  - CVE-2022-41842 PDF object loop in Catalog::countPageTree
  - CVE-2022-41843 missing bounds check in CFF font parser caused invalid
   memory access
  - CVE-2022-41844 PDF object loop in AcroForm::scanField
  - CVE-2022-43071 PDF object loop in Catalog::readPageLabelTree2
  - CVE-2022-43295 PDF object loop in Catalog::countPageTree
  - CVE-2022-45586 PDF object loop in Catalog::countPageTree
  - CVE-2022-45587 PDF object loop in Catalog::countPageTree
  - CVE-2023-2662 Divide-by-zero in Xpdf 4.04 due to bad color space object
  - CVE-2023-2663 PDF object loop in Catalog::readPageLabelTree2
  - CVE-2023-2664 PDF object loop in Catalog::readEmbeddedFileTree
  - CVE-2023-3044 Divide-by-zero in Xpdf 4.04 due to very large page size
  - CVE-2023-3436 Deadlock in Xpdf 4.04 due to PDF object stream references

Closes: https://bugs.gentoo.org/925519
Bug: https://bugs.gentoo.org/845027
Bug: https://bugs.gentoo.org/856475
Bug: https://bugs.gentoo.org/881351
Bug: https://bugs.gentoo.org/908037
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/xpdf/Manifest |   4 +
 app-text/xpdf/files/xpdf-4.05-font-paths.patch |  46 +++
 app-text/xpdf/xpdf-4.05.ebuild | 161 +
 3 files changed, 211 insertions(+)

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 5f89e2aa56cf..b87e88397670 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,13 +1,17 @@
 DIST xpdf-4.04.tar.gz 969535 BLAKE2B 
981f791c098b4632dd65ad581c0284beb730ebe1935dbe942882aa63fb23920eb241334e946ba9be07b5bc1b0c73effcccb2c8b2c95182a06d35a745862926a8
 SHA512 
a26b67a4b3d5a5a365153845bf72d77949e683ce26aaf4705b49194cb32bbc581617c3e9c37f74bf6c49480df06d49e8c38d41233966b6215eacf92591d4d9bf
 DIST xpdf-4.04.tar.gz.sig 801 BLAKE2B 
2f2b5c6a70ae007165afd3ec78c2fe168a380f6960176cc6c655a235aa83c1f7e608c5fd82cbce0b0877a92e3dea76950db450b96527eb14813ddcab2125a3ab
 SHA512 
4c2740cf6a659e896584339a1238089465a548547c829f047d0313e46f6e3bba6c404ff37df7baf2f5d0c317d6ec954167f31bb1501a65e638b2617c6730d925
+DIST xpdf-4.05.tar.gz 986596 BLAKE2B 
1ea706486c4597ced45bed8dea500173d65e5ec4bdbfac087d27916ee30d26f07ebef262a94d99e1bb192aa85434c5ad0e9008d6997a6e991b1fd251e87a7637
 SHA512 
1ee18a2fcae138e60158cf6289f588832a982e1b13995382a396d1953949cf4e32cb4f9884f2506154512d961853e70ff499a35c525e707c3bf2950fe7f9040b
+DIST xpdf-4.05.tar.gz.sig 801 BLAKE2B 
4cd3e4a35bf548eb3a55e6204535d0131a1595195a25362a60cead8f629d3b0e8f799fa066d0b46cea35eeb24b5b3e6253563e1c0a8ba941c0d8eea7bcfbeb2c
 SHA512 
86500cf8d5a7d588784f94dddf5d4533cfff1700b4f193add9c417896fd92d011b52615f341f30e82224740e845b7f870b9277d7f3cb1b250fd0db2bbd3123d1
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 
5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab
 SHA512 
1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
 DIST xpdf-chinese-simplified-20201222.tar.gz 912967 BLAKE2B 
74eb8da7642147cc6a0d5ee92379823786a78d0dccbdc1d4eab46094d15009bbe72599152b5001c58e7a88bfbb2f7af515e3582e293367a5b0a12bb1c017e8e1
 SHA512 
91c80dc4173a7b40267af1c95708f24557fb56ffc72cbaf48e9adcb0fc310b1bb40f327a8f36b3c6024317e98a44a8ab04d99f6f7b1ea81e775686534f0251ef
+DIST xpdf-chinese-simplified-20231205.tar.gz 913753 BLAKE2B 
1c8a38a0804a461cc9db435fd7e57df9a8513870d4d82d3a01ccd9182d0d0755f669f116bc5d919cdc510719c40be6d3ae2a83a9424fd6414e79f6ab05ec96cc
 SHA512 
81d5111b08e5f67a7a110acd2689eff8c80196709942f22e6e6a087b1f1e477b4126385fa48634168b3ba12ade580f6bf52529a44e3db81394d5d51c30e27385
 DIST xpdf-chinese-traditional-20201222.tar.gz 922808 BLAKE2B 
39a9bc0

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/, app-text/xpdf/files/

2024-01-05 Thread Sam James

commit: 501e2c8dc84171930394db872cb3cf145997d57b
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan  5 14:37:30 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan  5 14:37:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=501e2c8d

app-text/xpdf: fix urw font paths

Closes: https://bugs.gentoo.org/916446
Signed-off-by: Sam James  gentoo.org>

 app-text/xpdf/files/xpdf-4.04-font-paths.patch |  48 
 app-text/xpdf/xpdf-4.04-r2.ebuild  | 163 +
 2 files changed, 211 insertions(+)

diff --git a/app-text/xpdf/files/xpdf-4.04-font-paths.patch 
b/app-text/xpdf/files/xpdf-4.04-font-paths.patch
new file mode 100644
index ..04c4994f4667
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-4.04-font-paths.patch
@@ -0,0 +1,48 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=1509862
+https://bugs.gentoo.org/916446
+--- a/xpdf/GlobalParams.cc
 b/xpdf/GlobalParams.cc
+@@ -84,20 +84,20 @@
+   const char *obliqueFont;// name of font to oblique
+   double obliqueFactor;   // oblique sheer factor
+ } displayFontTab[] = {
+-  {"Courier",   "n022003l.pfb", "cour.ttf","Courier",  
"Courier",NULL, 0},
+-  {"Courier-Bold",  "n022004l.pfb", "courbd.ttf",  "Courier",  
"Courier Bold",   NULL, 0},
+-  {"Courier-BoldOblique",   "n022024l.pfb", "courbi.ttf",  "Courier",  
"Courier Bold Oblique",   "Courier-Bold",   0.212557},
+-  {"Courier-Oblique",   "n022023l.pfb", "couri.ttf",   "Courier",  
"Courier Oblique","Courier",0.212557},
+-  {"Helvetica", "n019003l.pfb", "arial.ttf",   "Helvetica",
"Helvetica",  NULL, 0},
+-  {"Helvetica-Bold","n019004l.pfb", "arialbd.ttf", "Helvetica",
"Helvetica Bold", NULL, 0},
+-  {"Helvetica-BoldOblique", "n019024l.pfb", "arialbi.ttf", "Helvetica",
"Helvetica Bold Oblique", "Helvetica-Bold", 0.212557},
+-  {"Helvetica-Oblique", "n019023l.pfb", "ariali.ttf",  "Helvetica",
"Helvetica Oblique",  "Helvetica",  0.212557},
+-  {"Symbol","s05l.pfb", NULL,  "Symbol",   
"Symbol", NULL, 0},
+-  {"Times-Bold","n021004l.pfb", "timesbd.ttf", "Times",
"Times Bold", NULL, 0},
+-  {"Times-BoldItalic",  "n021024l.pfb", "timesbi.ttf", "Times",
"Times Bold Italic",   NULL, 0},
+-  {"Times-Italic",  "n021023l.pfb", "timesi.ttf",  "Times",
"Times Italic",   NULL, 0},
+-  {"Times-Roman",   "n021003l.pfb", "times.ttf",   "Times",
"Times Roman",NULL, 0},
+-  {"ZapfDingbats",  "d05l.pfb", NULL,  "ZapfDingbats", 
"Zapf Dingbats",  NULL, 0},
++  {"Courier",   "NimbusMonoPS-Regular.t1","cour.ttf",
"Courier",  "Courier",NULL, 0},
++  {"Courier-Bold",  "NimbusMonoPS-Bold.t1",   "courbd.ttf",  
"Courier",  "Courier Bold",   NULL, 0},
++  {"Courier-BoldOblique",   "NimbusMonoPS-BoldItalic.t1", "courbi.ttf",  
"Courier",  "Courier Bold Oblique",   "Courier-Bold",   0.212557},
++  {"Courier-Oblique",   "NimbusMonoPS-Italic.t1", "couri.ttf",   
"Courier",  "Courier Oblique","Courier",0.212557},
++  {"Helvetica", "NimbusSans-Regular.t1",  "arial.ttf",   
"Helvetica","Helvetica",  NULL, 0},
++  {"Helvetica-Bold","NimbusSans-Bold.t1", "arialbd.ttf", 
"Helvetica","Helvetica Bold", NULL, 0},
++  {"Helvetica-BoldOblique", "NimbusSans-BoldItalic.t1",   "arialbi.ttf", 
"Helvetica","Helvetica Bold Oblique", "Helvetica-Bold", 0.212557},
++  {"Helvetica-Oblique", "NimbusSans-Italic.t1",   "ariali.ttf",  
"Helvetica","Helvetica Oblique",  "Helvetica",  0.212557},
++  {"Symbol","StandardSymbolsPS.t1",   NULL,  
"Symbol",   "Symbol", NULL, 0},
++  {"Times-Bold","NimbusRoman-Bold.t1","timesbd.ttf", 
"Times","Times Bold", NULL, 0},
++  {"Times-BoldItalic",  "NimbusRoman-BoldItalic.t1",  "timesbi.ttf", 
"Times","Times Bold Italic",   NULL, 0},
++  {"Times-Italic",  "NimbusRoman-Italic.t1",  "timesi.ttf",  
"Times","Times Italic",   NULL, 0},
++  {"Times-Roman",   "NimbusRoman-Regular.t1", "times.ttf",   
"Times","Times Roman",NULL, 0},
++  {"ZapfDingbats",  "D05L.t1", NULL,  "ZapfDingbats", 
"Zapf Dingbats",  NULL, 0},
+   {NULL}
+ };
+ 
+@@ -109,6 +109,7 @@
+ };
+ #else
+ static const char *displayFontDirs[] = {

[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/, app-text/xpdf/files/

2023-01-09 Thread Sam James

commit: 7e33adc640a4a1bf32892d9144ec060f9080b2e5
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  9 10:16:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  9 10:16:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e33adc6

app-text/xpdf: fix build w/ libpaper-2

Closes: https://bugs.gentoo.org/870217
Signed-off-by: Sam James  gentoo.org>

 app-text/xpdf/files/xpdf-4.04-libpaper-2.patch | 14 ++
 app-text/xpdf/xpdf-4.04-r1.ebuild  |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app-text/xpdf/files/xpdf-4.04-libpaper-2.patch 
b/app-text/xpdf/files/xpdf-4.04-libpaper-2.patch
new file mode 100644
index ..d6f3df150baf
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-4.04-libpaper-2.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/870217
+https://forum.xpdfreader.com/viewtopic.php?t=42367
+https://github.com/rrthomas/libpaper/issues/29
+--- a/xpdf/GlobalParams.cc
 b/xpdf/GlobalParams.cc
+@@ -655,7 +655,7 @@ GlobalParams::GlobalParams(const char *cfgFileName) {
+   base14SysFonts = new GHash(gTrue);
+   sysFonts = new SysFontList();
+ #if HAVE_PAPER_H
+-  char *paperName;
++  const char *paperName;
+   const struct paper *paperType;
+   paperinit();
+   if ((paperName = systempapername())) {

diff --git a/app-text/xpdf/xpdf-4.04-r1.ebuild 
b/app-text/xpdf/xpdf-4.04-r1.ebuild
index 9d39323e7d04..41d271c193ad 100644
--- a/app-text/xpdf/xpdf-4.04-r1.ebuild
+++ b/app-text/xpdf/xpdf-4.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -55,6 +55,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-automagic.patch
"${FILESDIR}"/${PN}-visibility.patch
"${FILESDIR}"/${PN}-shared-libs.patch
+   "${FILESDIR}"/${PN}-4.04-libpaper-2.patch
 )
 
 DOCS=( ANNOUNCE CHANGES README )

46 matches

Mail list logo