pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/librsvg Fix librsvg dependency patterns.
details: https://anonhg.NetBSD.org/pkgsrc/rev/5270598310c8
branches: trunk
changeset: 443840:5270598310c8
user: joerg <joerg%pkgsrc.org@localhost>
date: Sun Dec 27 02:33:27 2020 +0000
description:
Fix librsvg dependency patterns.
For the rust case, drop the redundant ancient API version and always add
the default ABI version, even if a package already specified one.
For the C case, provide an upper limit for both the API and ABI version,
so that the merge logic handles the cases correctly. Most noticable,
don't provide separate upper and lower limits.
diffstat:
graphics/librsvg/buildlink3.mk | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diffs (33 lines):
diff -r 7ed6fdd8c047 -r 5270598310c8 graphics/librsvg/buildlink3.mk
--- a/graphics/librsvg/buildlink3.mk Sat Dec 26 23:39:30 2020 +0000
+++ b/graphics/librsvg/buildlink3.mk Sun Dec 27 02:33:27 2020 +0000
@@ -1,25 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.60 2020/11/05 09:06:55 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.61 2020/12/27 02:33:27 joerg Exp $
BUILDLINK_TREE+= librsvg
.if !defined(LIBRSVG_BUILDLINK3_MK)
LIBRSVG_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.12.6nb1
-
.include "../../mk/bsd.fast.prefs.mk"
.include "../../graphics/librsvg/available.mk"
.if ${LIBRSVG_TYPE} == "rust"
-BUILDLINK_ABI_DEPENDS.librsvg?= librsvg>=2.48.3nb3
BUILDLINK_PKGSRCDIR.librsvg?= ../../graphics/librsvg
+BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.48.3nb3
BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.41
-BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.48.0
.elif ${LIBRSVG_TYPE} == "c"
BUILDLINK_PKGSRCDIR.librsvg?= ../../graphics/librsvg-c
-BUILDLINK_API_DEPENDS.librsvg+= librsvg<2.41
-BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.40.20nb4
+BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=2.40.20nb4<2.41
+BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.12.6nb1<2.41
.include "../../textproc/libcroco/buildlink3.mk"
.else
Home |
Main Index |
Thread Index |
Old Index