diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
| commit | c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch) | |
| tree | c44943ee0563a3fa957716de909fed683117fcb9 /app-text/diff-pdf | |
| parent | 69051588e2f955485fe5d45d45e616bc60a2de57 (diff) | |
gentoo (valentine's day) resync : 14.02.2021
Diffstat (limited to 'app-text/diff-pdf')
| -rw-r--r-- | app-text/diff-pdf/Manifest | 3 | ||||
| -rw-r--r-- | app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild (renamed from app-text/diff-pdf/diff-pdf-0.4.1.ebuild) | 17 | ||||
| -rw-r--r-- | app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch | 24 |
3 files changed, 38 insertions, 6 deletions
diff --git a/app-text/diff-pdf/Manifest b/app-text/diff-pdf/Manifest index 3923ef1e31de..0267f73e534d 100644 --- a/app-text/diff-pdf/Manifest +++ b/app-text/diff-pdf/Manifest @@ -1,5 +1,6 @@ +AUX diff-pdf-0.4.1-no-poppler-cairo-check.patch 798 BLAKE2B f3932e5e7babd37b0df89f37536b91eee4978b3ac34b8c9e628f0db3f2d0a617f872b137cabc257e6cf470d6b80aade4c835e91310ec84b296d46d24c457f5f3 SHA512 2f4c399e482ace0e00995a732f0489d8b614e31396ed6279b0399e8c009b228386319a611ee52b784ba2313561e7aef27ae5b9090d3fb78fa09660992d483cc8 DIST diff-pdf-0.3.tar.gz 132862 BLAKE2B bb3fa163337482785778fa7cbeab3e9f883d8537e4a905592eb20f4bb876597f500beaa2d9f13706887e1d340dd378c68c231b91a4dd478fb206b32f2cbd768c SHA512 b85585162b498c5abf14020ad04616ebdb5efce25b20604dab81c6068a036a818d7e10ddbbdb69d278d4b5a46ab9b9aa782a52e37f278f3e9db7b4d2259aaa08 DIST diff-pdf-0.4.1.tar.gz 137715 BLAKE2B f77b7a690f2a99aa003c1a36015113f0b3355acc45346637535231f763aa733174eca6b1f962058c625e06176fa13868965b3b67ddf6ffe249202ff799051e37 SHA512 4b7b49d7008b5920be86af8398dea41933888677b66505af0ca4daecbd1662dc0b3c04e7b2631d86680cdae4b0b58d24bcd4ddc2b7589127b682d4b97a179b88 EBUILD diff-pdf-0.3.ebuild 1289 BLAKE2B 3eef9f78e56f7f0da662a8ad3fb75e8b5683d58c3dcdc6d4df426d78814b834afec798b0189bf22c65da304d5ccfea1afd324d7f066536f0b162f89715af6596 SHA512 5f667ed5f3391c1fd6bbf426d7947b50e5c75ae0aab61dbe20c1c6efd3710b18d9d2a8c1407e657219db6a58b9450542eacd52bbd382361ba7341d99b00ada23 -EBUILD diff-pdf-0.4.1.ebuild 1290 BLAKE2B 6f960173b5b8fc9a853a47fcc356008f2e98e8a3112a4dae7cb71c381fbb2bc2040212e821c668ea31633b14d83d0e93b54ff80c49c4616aed4416e7fdfd9c24 SHA512 85a2da6028e118be3eabc04f7580bf94a6a164d534fc409262f451fff80fe6ecd7a54b1ae7a15eb7bd60c49873014d9a85cf8cd1a5550a01ec559f0f6f9b7bf6 +EBUILD diff-pdf-0.4.1-r2.ebuild 1412 BLAKE2B c8b69c608f797be990cd7ff2bba3d8394efe6a9fcf0824e386d78a65194f37db2002a33f85316dea65263083d6990201a94b32717b0678b98a64c4657d332546 SHA512 bbbf7c920ce7663f518c8f0517c022a58e1d7d2632312d89c9356fb8dc855a4fbc77c98fb766fc2ac2775fddeedee3a1e34e413ee97b34338f52a2d86150b361 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742 diff --git a/app-text/diff-pdf/diff-pdf-0.4.1.ebuild b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild index 5b18231db4e7..992e9b377978 100644 --- a/app-text/diff-pdf/diff-pdf-0.4.1.ebuild +++ b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # No EAPI=7 support in wxwidgets.eclass. -EAPI=6 +EAPI=7 -inherit wxwidgets +inherit autotools wxwidgets DESCRIPTION="A simple tool for visually comparing two PDF files" HOMEPAGE="http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/" @@ -29,11 +29,18 @@ IUSE="" DEPEND="app-text/poppler[cairo] dev-libs/glib x11-libs/cairo - x11-libs/wxGTK:3.0[X]" + x11-libs/wxGTK:3.0-gtk3[X]" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-no-poppler-cairo-check.patch" ) + +src_prepare() { + default + eautoreconf +} + src_configure() { - WX_GTK_VER="3.0" + WX_GTK_VER="3.0-gtk3" setup-wxwidgets default } diff --git a/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch b/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch new file mode 100644 index 000000000000..ecef020a998a --- /dev/null +++ b/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch @@ -0,0 +1,24 @@ +From 00fd9ab8bf435658616f3f25b18d51b0a7ee5769 Mon Sep 17 00:00:00 2001 +From: FX Coudert <fxcoudert@gmail.com> +Date: Sat, 12 Dec 2020 16:18:59 +0100 +Subject: [PATCH] Remove legacy poppler-cairo dependency (#69) + +poppler-glib already depended on it, so this is non-breaking, +and it is removed in poppler 0.18.1. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 382e220..2e9b6e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -41,7 +41,7 @@ AC_LANG(C++) + dnl === Library checks === + + PKG_CHECK_MODULES(POPPLER, +- [poppler-cairo >= 0.10 poppler-glib >= 0.10 cairo-pdf]) ++ [poppler-glib >= 0.10 cairo-pdf]) + + AM_OPTIONS_WXCONFIG + AM_PATH_WXCONFIG([3.0.0], [wxfound=1], [wxfound=0], [core,base]) |