mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-06 02:17:34 -08:00
dev-perl/Image-Imlib2: adapt to imlib2 dropping imlib2-config
Only docs would be installed as it wasn't propagating the failed configure test, so use a patch from the bug tracker but also fix that while at it. Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
parent
5ed8186f06
commit
4a5d0cd274
48
dev-perl/Image-Imlib2/Image-Imlib2-2.30.0-r3.ebuild
Normal file
48
dev-perl/Image-Imlib2/Image-Imlib2-2.30.0-r3.ebuild
Normal file
@ -0,0 +1,48 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DIST_AUTHOR=LBROCARD
|
||||
DIST_VERSION=2.03
|
||||
DIST_TEST="do verbose"
|
||||
inherit perl-module toolchain-funcs
|
||||
|
||||
DESCRIPTION="Interface to the Imlib2 image library"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~ppc ~x86"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND=">=media-libs/imlib2-1"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
${RDEPEND}
|
||||
>=dev-perl/Module-Build-0.28
|
||||
virtual/pkgconfig
|
||||
test? (
|
||||
>=media-libs/imlib2-1[jpeg,png]
|
||||
)
|
||||
"
|
||||
|
||||
PERL_RM_FILES=(
|
||||
t/pod.t
|
||||
t/pod_coverage.t
|
||||
|
||||
# not ok 12
|
||||
# Failed test at t/simple.t line 68.
|
||||
# got: '0'
|
||||
# expected: '1'
|
||||
t/simple.t
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.30.0-r2-imlib2-pkg-config.patch
|
||||
"${FILESDIR}"/${PN}-2.30.0-r2-respect-PKG_CONFIG-and-error.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
tc-export PKG_CONFIG
|
||||
perl-module_src_configure
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
https://rt.cpan.org/Public/Bug/Display.html?id=149742
|
||||
|
||||
From 319db4d47493f7ef3909efc1b3904c134c90af5e Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Zhmylev <zhmylove@cpan.org>
|
||||
Date: Mon, 11 Sep 2023 21:29:17 +0300
|
||||
Subject: [PATCH] Make Build.PL compatible with Imlib2 v1.7.5+
|
||||
|
||||
--- a/Build.PL
|
||||
+++ b/Build.PL
|
||||
@@ -1,10 +1,14 @@
|
||||
use Module::Build;
|
||||
use strict;
|
||||
|
||||
-# We need to find imlib2-config
|
||||
-my $CONFIG = "imlib2-config";
|
||||
+my $CONFIG = "pkg-config imlib2";
|
||||
|
||||
my $version = `$CONFIG --version`;
|
||||
+if (!$version) {
|
||||
+ # Try deprecated imlib2-config
|
||||
+ $CONFIG = "imlib2-config";
|
||||
+ $version = `$CONFIG --version`;
|
||||
+}
|
||||
if (!$version) {
|
||||
warn 'You must install the imlib2 library before you can install
|
||||
Image::Imlib2. You can obtain imlib2 from
|
||||
--
|
||||
2.40.0
|
||||
@ -0,0 +1,21 @@
|
||||
--- a/Build.PL
|
||||
+++ b/Build.PL
|
||||
@@ -1,7 +1,8 @@
|
||||
use Module::Build;
|
||||
use strict;
|
||||
|
||||
-my $CONFIG = "pkg-config imlib2";
|
||||
+my $PKG_CONFIG = $ENV{PKG_CONFIG} || 'pkg-config';
|
||||
+my $CONFIG = "${PKG_CONFIG} imlib2";
|
||||
|
||||
my $version = `$CONFIG --version`;
|
||||
if (!$version) {
|
||||
@@ -18,7 +19,7 @@ Alternatively, if you have downloaded and installed imlib2 and this
|
||||
still will not work, modify the $CONFIG variable inside Build.PL to
|
||||
point to the imlib2-config program that provides.
|
||||
';
|
||||
- exit 0;
|
||||
+ exit 1;
|
||||
} else {
|
||||
print "Found imlib2 $version";
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user